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

From: Chris Larson <clarson@kergoth.com>
Date: Aug 15, 2007, 00:18 UTC
Message-ID: <b6ebd0a50708141718w15ad2bbbrfa1d3c97ca7d4397@mail.gmail.com>
In-Reply-To: <7vlkcdacbi.fsf@assigned-by-dhcp.cox.net>

On 8/14/07, Junio C Hamano <gitster@pobox.com> wrote:

Show 15 quoted lines

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

I got bit by this one earlier, and the patch fixed it here.

-- 
Chris Larson - clarson at kergoth dot com
Dedicated Engineer - MontaVista - clarson at mvista dot com
Core Developer/Architect - TSLib, BitBake, OpenEmbedded, OpenZaurus