在远程合并了一个拉取请求后，将更改拉到本地分支时为什么会有冲突？

Question

From my develop branch I create a feature branch and make some changes. After all my changes have been made I squash all my commits so that only 1 commit message is added after the merge like so, git reset --soft HEAD~X & git commit & git push -f , where X is the number of commits to squash.

A pull request is then created and the feature is successfully merged into develop without any conflicts. I then wish to update my local develop branch, so I do the following git checkout develop & git pull .

There are conflicts, why is this, and how might I avoid them?

Note that there have been no changes made to the local copy of develop in this scenario.

Answer 1

There are conflicts, why is this, and how might I avoid them?

Someone else has committed code that cause it.
In order to avoid it try to use pull request is you can, all major servers support it and you will see the conflicts before its being merged.

The best way to handle it is to pull developer into your feature branch very frequently. This will lower the possibility of having conflicts.

If you wish to run "dry run" before merging you can this (depend what is your current checked-out branch)

git log ^branchA branchB

git log ^develop feature
git log develop ^feature

Answer 2

Usually it's fast forward pull as Mark said.

If there has conflict, it's mainly caused the develop branch has been force changed (squash, rebase etc). Before you pull changes from remote develop branch to local devlop branch, you can check by below commands:

git fetch origin develop
git log develop..origin/develop --oneline
git log origin/develop..develop --oneline

If git log origin/develop..develop --oneline has output, that means the develop branch commit history has been changed by others.