What are
the necessary and sufficient conditions, and/or
all the cases or some common cases
that can cause
git mergereport merge conflict?How does
git mergedetermine whether a line or some lines contain merge conflict(s)?For example, I sometimes see cases like the following, where either
Part 1orPart 2is empty in<<<<<<< HEAD (Part 1) ======= (Part 2) >>>>>>> some-other-branchIt looks unlikely to have a merge conflict to me. So what are some possible reasons that cases like that have merge conflicts?
Comparing the merge conflicts reported by
git mergeand the differences reported bygit diff, is it correct thatthe differences reported by
git diffmight not necessarily be in the places of the merge conflicts reported bygit merge, andthe merge conflicts reported by
git mergemight not necessarily be in the places of the differences reported bygit diff?
Thanks.