From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 08 Nov 2005 11:58:50 GMT
Subject: Re: Comments on recursive merge..
Message-ID: <Pine.LNX.4.63.0511081254520.2649@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <Pine.LNX.4.64.0511071629270.3247@g5.osdl.org>

Hi,

On Mon, 7 Nov 2005, Linus Torvalds wrote:

> Is the recursive thing noticeably slower for the "easy" cases (ie things 
> that the old regular resolve strategy does well)?

IIRC recursive does nothing else than recursively merging the merge-bases 
(granted, in a clever way). So if there is only one merge-base, the only 
slow-down would be the startup of python (which is probably worth it, 
anyway).

> It's certainly an option to just do what I just did, namely use the 
> default one until it breaks, and then just do "git reset --hard" and re-do 
> the pull with "-s recursive". A bit sad, and it would be good to have 
> coverage on the recursive strategy..

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.

Ciao,
Dscho