It may be anycodings_git-merge the case that many of these lines are in anycodings_git-merge common, but the conflict is logically anycodings_git-merge the fact that two different sets of anycodings_git-merge lines are added, so the entire file anycodings_git-merge conflicts. However, in the case where the files are anycodings_git-merge not identical and you have unrelated anycodings_git-merge histories, Git considers this an add/add anycodings_git-merge conflict: that is, one side has added anycodings_git-merge some set of lines and the other side has anycodings_git-merge added another set of lines. This explains why identical anycodings_git-merge files work just fine for you in this anycodings_git-merge case.

anycodings_git-merge Both sides share identical changes, so anycodings_git-merge there's no point in doing any fancy anycodings_git-merge analysis. If, on merge, the file is identical on anycodings_git-merge both sides (that is, the blob has the anycodings_git-merge same object ID), then the result of the anycodings_git-merge merge is simply to take that blob as the anycodings_git-merge value for that file during the merge.

If you're merging anycodings_git-merge unrelated histories, this common anycodings_git-merge ancestor is the empty tree that is, the anycodings_git-merge state with no files.Ī merge takes the sum of the result of anycodings_git-merge applying the differences between the anycodings_git-merge merge base and each head. When Git performs a normal merge, it anycodings_git-merge considers exactly three points: the two anycodings_git-merge heads you're merging, and the merge anycodings_git-merge base, which is usually the nearest anycodings_git-merge common ancestor.

Git resolving conflict winmerge git