What constitutes a merge conflict in Git?
问题 How does git determine that a particular merge has a conflict and what the conflict is? My guess would go something like this: if the two commits being merged have a common parent commit, and if they have both changed line X from what the parent had, that's a conflict. What complicates my understanding is: "Changing line X" can mean replacing it with several new lines, and that's still shown as one conflict (version A has this one line, and version B has these 5 lines, or whatever) If you did