From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 08 Nov 2005 23:04:26 GMT
Subject: Re: Comments on recursive merge..
Message-ID: <Pine.LNX.4.63.0511090003280.27861@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <20051108210211.GA23265@c165.ib.student.liu.se>

Hi,

On Tue, 8 Nov 2005, Fredrik Kuivinen wrote:

> On Tue, Nov 08, 2005 at 12:58:50PM +0100, Johannes Schindelin wrote:
> > 
> > We already have a fallback list: after really-trivial, try automatic, ...,
> > try resolve. Why not just add recursive? So, if even resolve failed, just 
> > try once more, with recursive.
> > 
> 
> I don't think this is a very good idea for two reasons. The first one
> is that there are some merge scenarios involving renames which should
> be conflicts but are cleanly merged by git-resolve.
> 
> The second reason is that with the fall back list the recursive
> strategy will only be used in the strange corner cases and will thus
> not get nearly the same amount of testing it would get if it was the
> first choice (or directly after the really-trivial merge).

Two very valid points. You convinced me.

Ciao,
Dscho