Re: merge-recursive: do not rudely die on binary merge

On Tue, Aug 14, 2007 at 05:09:05PM -0700, Junio C Hamano wrote:

Chris Shoemaker [off-list ref] writes:

quoted

quoted

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.

Yes, with this patch, the merge completes, and leaves the index and
working tree in a sane state.  Thanks again.

-chris