Re: Comments on recursive merge..

From: Linus Torvalds <torvalds@osdl.org>
Date: Nov 8, 2005, 00:33 UTC
Message-ID: <Pine.LNX.4.64.0511071629270.3247@g5.osdl.org>
In-Reply-To: <7vll00ov2l.fsf@assigned-by-dhcp.cox.net>

On Mon, 7 Nov 2005, Junio C Hamano wrote:

> 
> This is the first time I see you pleased by something in git
> that was done without very close supervision from you.

That sounds like a backhanded way of saying that I'm micromanagering, picky and difficult to work with ;)

> Another thing to consider is if it is fast enough for everyday
> trivial merges.

Hmm. True. The _really_ trivial in-index case triggers for me pretty often, but I haven't done any statistics. It might be only 50% of the time.

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

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..

		Linus