git冲突产生原因_git合并冲突如何发生？

I have made a git repository and added a text file to it. This is 100% for learning purpose.

I added "1" to the text file and committed it to master.

Created a new branch from master and appended "2".

Finally, created a branch from master and appended "3".

Could you please explain how a conflict may occur in this, or any other, scenario?

解决方案

You will have a conflict if you merge:

branch2 to master (no conflict)

branch3 to master (conflict):

That is because:

The common ancestor would be master (with a second line empty)

the source content is branch3 (with a second line including "3")

the destination content is on latest of master (with a second line including "2", from the merge of branch2 to master)

Git will ask you to choose which content to keep ("3", "2", or both).

First, do the merges after:

git config merge.conflictstyle diff3