Re: [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution

From: Jeff King <peff@peff.net>
Date: Aug 4, 2006, 03:31 UTC
Message-ID: <20060804033144.GB24818@coredump.intra.peff.net>
In-Reply-To: <44D296D8.4030200@catalyst.net.nz>

On Fri, Aug 04, 2006 at 12:37:44PM +1200, Martin Langhoff (CatalystIT) wrote:

Show 11 quoted lines

> >instead check for stage 2 ("ours") for the path.
> Reading Documentation/git-read-tree.txt it seems to mean that stage 1 is 
> merge base, 1 is ours and 2 is the branch being merged in.
> 
> I am confused...
> 
> Quote:
> >When performing a merge of another
> >branch into the current branch, we use the common ancestor tree
> >as <tree1>, the current branch head as <tree2>, and the other
> >branch head as <tree3>.

Look further down:
   OK, this all sounds like a collection of totally nonsensical rules,
   but it's actually exactly what you want in order to do a  fast
   merge.  The different stages  represent the "result tree" (stage 0,
   aka "merged"), the original tree (stage 1, aka "orig"), and the two
   trees you are trying to merge (stage 2 and 3 respectively).

HTH, -Peff