Andreas Ericsson wrote:
> On 06/09/2011 11:06 AM, Michael Haggerty wrote:
> > THEIRS -- equivalent to the tree from MERGE_HEAD
>
> Except there might be any number of THEIRS in the case of an octopus
> merge. The most common case is just one though.
Not really, the current implementation bails out and tells you not to
use an octopus:
Trying simple merge with t/man-unquote-apos-3
Simple merge did not work, trying automatic merge.
Auto-merging Documentation/Makefile
ERROR: content conflict in Documentation/Makefile
Auto-merging Makefile
fatal: merge program failed
Automated merge did not work.
Should not be doing an Octopus.
Merge with strategy octopus failed.
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
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