From: Junio C Hamano <junkio@cox.net>
To: Petr Baudis <pasky@ucw.cz>, Daniel Barkalow <barkalow@iabervon.org>
Cc: git@vger.kernel.org
Subject: Re: Strange merge conflicts against earlier merge.
Date: Fri, 11 Nov 2005 14:39:28 -0800 [thread overview]
Message-ID: <7vy83ukdwf.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20051111215620.GX16061@pasky.or.cz> (Petr Baudis's message of "Fri, 11 Nov 2005 22:56:20 +0100")
Petr Baudis <pasky@ucw.cz> writes:
> 16 anc1/anc2 anc1 anc2 no merge
>
> What ends up in the index at this moment as "stage 1"? anc1? anc2?
> Two stage 1 entries? And what does git-merge-index do about this?
I think we decided there is no single sensible resolution, and
we leave stage 1 empty.
Come to think of it, we should signal that we are punting by
either exiting non-zero, or stuffing 0{40} SHA1 in stage1, so
that we can distinguish the case with two sides adding things
differently. Daniel, what do you think?
next prev parent reply other threads:[~2005-11-11 22:42 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
[not found] ` <7v1x1nni78.fsf@assigned-by-dhcp.cox.net>
2005-11-11 21:56 ` Petr Baudis
2005-11-11 22:39 ` Junio C Hamano [this message]
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=7vy83ukdwf.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
/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).