Vincent Bernardi <vincent@xxxxxxxxxxxxx> writes: > Hi, > I asked about this problem on #git@freenode and someone suggested I > submit it to this list. I have a case where the output of a merge > gives a conflict and produces the following file: > > Code Block A > <<<<<<< HEAD > ======= > Code Block B >>>>>>>> branch-B > Code Block B' (similar to code block B but not exactly the same). > > Here is what HEAD looks like > Code Block A > Code Block B' > > and branch-B: > Code Block A > Code Block B > > I thought that taking a conflicted file like above and removing the > three following lines: > <<<<<<< HEAD > ======= >>>>>>>> branch-B > > was supposed to produce *exactly* the branch-B version? No? It will produce the branch-B version in the conflicted area, but that does not mean that conflict resolution might not have been done outside of that area. -- David Kastrup -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html