Re: Strange merge conflicts against earlier merge.

Dear diary, on Fri, Nov 11, 2005 at 07:38:19PM CET, I got a letter
where Junio C Hamano [off-list ref] said that...

Petr Baudis [off-list ref] writes:

quoted

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.

Documentation/technical/ perhaps?

This contains the merge resolution tables, which is very useful - thanks
for that.

However, it still doesn't seem to answer my question - do the additional
trees result in additional stages? Let's take e.g.:

	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?

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.