Stephen Bash <b...@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"
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.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html