From: Petr Baudis <pasky@suse.cz>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: Strange merge conflicts against earlier merge.
Date: Fri, 11 Nov 2005 18:32:39 +0100 [thread overview]
Message-ID: <20051111173239.GU16061@pasky.or.cz> (raw)
In-Reply-To: <7v64qzozyx.fsf@assigned-by-dhcp.cox.net>
Dear diary, on Fri, Nov 11, 2005 at 06:29:10PM CET, I got a letter
where Junio C Hamano <junkio@cox.net> said that...
> - The above turned out to have a risky corner case, especially
> when one side reverted a patch and the other one did not. To
> address this, read-tree was rewritten and 3-way form of
> read-tree can take more than three trees these days, letting
> you feed it all the merge base candidates. This code is used
> in 'resolve' strategy.
Yes, but what I didn't find out is whether the additional trees result
in additional stages, what are the trivial merging rules, how does it
play together with git-merge-index, etc. Doesn't seem to be documented
either.
Thanks,
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.
next prev parent reply other threads:[~2005-11-11 17:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-10 0:38 Strange merge conflicts against earlier merge Martin Langhoff
2005-11-10 10:20 ` Petr Baudis
2005-11-11 4:40 ` Martin Langhoff
2005-11-11 11:35 ` Petr Baudis
2005-11-11 7:52 ` Fredrik Kuivinen
2005-11-11 11:45 ` Petr Baudis
2005-11-11 13:12 ` Petr Baudis
2005-11-11 17:29 ` Junio C Hamano
2005-11-11 17:32 ` Petr Baudis [this message]
[not found] ` <7v1x1nni78.fsf@assigned-by-dhcp.cox.net>
2005-11-11 21:56 ` Petr Baudis
2005-11-11 22:39 ` Junio C Hamano
2005-11-11 23:33 ` Daniel Barkalow
2005-11-12 0:50 ` Junio C Hamano
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=20051111173239.GU16061@pasky.or.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).