From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Tue, 08 Nov 2011 08:52:26 GMT
Subject: Re: git-apply that handles rejects like merge conflicts
Message-ID: <CAKPyHN1cqG9-g1Q4iGbUOtfiXLc6EPcFH2cWNCep3af4cTdzSg@mail.gmail.com>
In-Reply-To: <20111107225508.GB28188@sigill.intra.peff.net>

On Mon, Nov 7, 2011 at 23:55, Jeff King <peff@peff.net> wrote:
> In the general case, you can't represent all failed hunks with conflict
> markers, can you? I'm thinking something where we couldn't find any
> relevant context. You know the lines from the original patch from the
> hunk header, so you can drop the failed content from the patch in the
> right spot. But how do you know how big a conflict marker to make for
> the "current" side? The same number of lines as were in the hunk?
> I think you'd end up with confusing conflict markers.

GNU patch can produce conflict markers with the --merge option.

Bert

>
> -Peff