From: Elijah Newren <newren@gmail.com>
Date: Thu, 15 Aug 2019 22:06:51 GMT
Subject: Re: BUG?: xdl_merge surprisingly does not recognize content conflict
Message-ID: <CABPp-BHupqJaJzK9yXxvTEPkuaoq_yW0ZJ7z0nZXODhaRdrYyg@mail.gmail.com>
In-Reply-To: <20190815220303.17209-1-newren@gmail.com>

On Thu, Aug 15, 2019 at 3:03 PM Elijah Newren <newren@gmail.com> wrote:
>
> It appears git.git had a case of a patch being resubmitted and both the
> original (nd/checkout-m-doc-update) and new (nd/checkout-m) versions
> getting applied, with the merge picking to include both versions of some
> of the text rather than just one of the two.  I have a patch below to
> delete the duplicate hunk, but more surprising to me was the fact that
> re-running the merge in question did not show any conflicts despite the
> two patches adding different text in the same location.

Sorry, I should specify that I've tested that this behavior goes back
to at least git-1.6.0, so it certainly isn't a new regression and
doesn't need to hold up git-2.23.0 by any means.