From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Aug 2007 00:09:05 GMT
Subject: Re: merge-recursive: do not rudely die on binary merge
Message-ID: <7vlkcdacbi.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070814231422.GA10662@pe.Belkin>

Chris Shoemaker <c.shoemaker@cox.net> writes:

>> This changes merge-recursive to still warn but do the "binary"
>> merge for such a path; leave the "our" version in the working
>> tree, but still keep the path unmerged so that the user can sort
>> it out.
>
> Very nice.

Forgot to ask.  I did this because you had trouble on #git
yesterday and then at around the same time today somebody else
had the same issue.  Did this patch solve your problem?  I do
not think this has big risk of regression, but if it does not
help anything there is no reason to put it in 1.5.3, so I am
asking for a success report.