From: Junio C Hamano <junkio@cox.net>
Date: Fri, 11 Nov 2005 22:39:28 GMT
Subject: Re: Strange merge conflicts against earlier merge.
Message-ID: <7vy83ukdwf.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051111215620.GX16061@pasky.or.cz>

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?