Re: [PATCH] Keep rename/rename conflicts of intermediate merges while doing recursive merge

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mar 31, 2007, 12:53 UTC
Message-ID: <Pine.LNX.4.63.0703311452300.4045@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <Pine.LNX.4.63.0703311445190.4045@wbgn013.biozentrum.uni-wuerzburg.de>

Hi,

On Sat, 31 Mar 2007, Johannes Schindelin wrote:

Show 17 quoted lines

> On Sat, 31 Mar 2007, Alex Riesen wrote:
> 
> > This patch leaves the base name in the resulting intermediate tree, to
> > propagate the conflict from intermediate merges up to the top-level merge.
> 
> I'd rather have conflict files, i.e.
> 
> 	for each entry in the index which is unmerged,
> 		write the file in this form:
> 		<<<<<<
> 		[stage2]
> 		======
> 		[stage3]
> 		>>>>>>
> 
> 		mark as merged (i.e. remove stages 1--3 from the index, 
> 		and add the conflicted file as stage 0)

Side note: for the "src->dest1,dest2" case, I really would like to see a threeway merge. But I would want the above-mentioned behaviour _before_ that, to make sure that we have a reasonable fallback for hard cases.

Ciao, Dscho