From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 08 Nov 2011 06:15:33 GMT
Subject: Re: git-apply that handles rejects like merge conflicts
Message-ID: <7vd3d3ywai.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20111108054643.GC29643@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> But I think there are two questions:
>
>   1. Should am's 3-way fallback be made more easily available to users
>      of regular "apply"?
>
>   2. Short of doing a 3-way merge, are there better ways to represent
>      failed hunks in the patch target itself, rather than saving ".rej"
>      files?
>
> I'm actually not sure which one Ori was asking about.

Me neither, but if I have to guess it would be the former. If there were a
solution better than ".rej" in 2-way context, surely "patch" would have
implemented it 10 years before we started ;-).