From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Sep 2012 17:01:30 GMT
Subject: Re: [PATCH 2/2] attr: "binary" attribute should choose built-in "binary" merge driver
Message-ID: <7vhar3dvkl.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1734879571.321704.1347454681726.JavaMail.root@genarts.com>

Stephen Bash <bash@genarts.com> writes:

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

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