From: "Martin Langhoff (CatalystIT)" <martin@catalyst•net.nz>
To: Jeff King <peff@peff•net>
Cc: Junio C Hamano <junkio@cox•net>, git@vger•kernel.org
Subject: Re: [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution
Date: Fri, 04 Aug 2006 15:48:35 +1200 [thread overview]
Message-ID: <44D2C393.8090508@catalyst.net.nz> (raw)
In-Reply-To: <20060804033144.GB24818@coredump.intra.peff.net>
Jeff King wrote:
> On Fri, Aug 04, 2006 at 12:37:44PM +1200, Martin Langhoff (CatalystIT) wrote:
>
>
>>>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).
Grr. I just re-read my own email, and I can't believe how stupid my
question was. Still, git-xxdiff is doing the right thing, stage 2 is
"ours" and stage 3 is "branch we are merging in".
cheers,
martin
--
-----------------------------------------------------------------------
Martin @ Catalyst .Net .NZ Ltd, PO Box 11-053, Manners St, Wellington
WEB: http://catalyst.net.nz/ PHYS: Level 2, 150-154 Willis St
OFFICE: +64(4)916-7224 MOB: +64(21)364-017
Make things as simple as possible, but no simpler - Einstein
-----------------------------------------------------------------------
prev parent reply other threads:[~2006-08-04 3:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-03 23:53 [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution Martin Langhoff
2006-08-04 0:01 ` Junio C Hamano
2006-08-04 0:16 ` Martin Langhoff (CatalystIT)
2006-08-04 0:37 ` [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution - take 2 Martin Langhoff
2006-08-04 8:09 ` Alex Riesen
2006-08-05 3:26 ` Martin Langhoff
2006-08-04 0:37 ` [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution Martin Langhoff (CatalystIT)
2006-08-04 3:31 ` Jeff King
2006-08-04 3:48 ` Martin Langhoff (CatalystIT) [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44D2C393.8090508@catalyst.net.nz \
--to=martin@catalyst$(echo .)net.nz \
--cc=git@vger$(echo .)kernel.org \
--cc=junkio@cox$(echo .)net \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox