Re: [PATCH 2/2] attr: "binary" attribute should choose built-in "binary" merge driver
----- Original Message -----
Show 9 quoted lines
> From: "Junio C Hamano" <gitster@pobox.com>
> Sent: Wednesday, September 12, 2012 1:01:30 PM
> Subject: Re: [PATCH 2/2] attr: "binary" attribute should choose built-in "binary" merge driver
>
> >> Perhaps something like this makes it better.
> >
> > Patch didn't apply on top of the previous two for me,...
>
> Look at 'pu' and see how it applies.
Ah, that seems to work better.
Show 9 quoted lines
> > ... The only remaining
> > question for me is should -Xtheirs resolve "deleted by them"
> > conflicts?
>
> I do not know, and I do not care to worry about it too deeply, which
> means I would rather err on the safe side and have users inspect the
> situation, make the decision when such a conflict happens and
> resolve them themselves, instead of claiming a clean resolution that
> is possibly wrong.
A reasonable approach. Thanks for clarifying.
Stephen