Linus Torvalds, Sat, Mar 31, 2007 03:03:36 +0200: > > > > We're looking for a base version for a merge - think of a three-way merge > > on a file level. And the easiest base version is actually an empty base > > file (or, when it comes to a rename conflict, no base names at all). > > Note that "easiest" isn't "best". > > For data conflicts in intermediate merges, we use the conficted file, > conflict markers and all, as the base. > > I suspect we should do exactly the same for filename conflicts. Write the > intermediate tree with *both* files, including conflict markers. I'd > suggest writing out the conflicting names to the intermediate tree > *exactly* the same way we do for the final tree in the working tree, but > mayne we could just write them with the SHA of the content appended to the > filename or something..) > The names are already different (base->a, base->b), what is the SHA for? I tried leaving all three names in the computed tree (base, a and b). The result is sometimes spectacular, but seldom useful. - 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