On Mon, Aug 25, 2014 at 12:44 PM, Jeff King <p...@peff.net> wrote: > For my own curiosity, how do you get into this situation, and what does > it mean to have multiple stage#1 entries for the same path? What would > "git cat-file :1:path" output?
That is how we natively (read: not with the funky "virtual" stuff merge-recursive does) express a merge with multiple merge bases. You also should be able to read this in the way how "git merge" invokes merge strategies (one or more bases, double-dash and then current HEAD and the other branches). I think there are some tests in 3way merge tests that checks what should happen when our HEAD matches one of the stage #1 while their branch matches a different one of the stage #1, too. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
