Git合并提交为冲突创造了更多机会

Question

I'm trying to understand why I have to do merges multiple times in a long running branch.

Once in a while I merge master back into my branch, resolve conflict and commit. But I realize that this later commit is more modification to a file that may end up creating more merge conflict if the same files are modified in the master branch.

I feel that as long as more modifications to the same file occurs in the master branch I will have to manually edit conflicts even though I'm not making any other changes to said files in my branch.

How do people deal with this?

Answer 1

If you have long running branch you can always do

git fetch origin
git rebase origin/master

to be always on top of the master branch.

---

But as @David Deutsch said you do not want to do that if your branch is already pushed to origin.

Nothing will prevent you from merge conflicts. Conflict is conflict. If someone else is working with you on this file this is indication that you have some smell in the project (SRP principle violated). The only way to reduce conflicts is to have only short living branches.

Answer 2

是的，只有快速合并，无论是1个还是n个使用某个功能的用户，每个新的“发行版”都有其自己的分支，并且所有提交都相互弹出