git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Elijah Newren <newren@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Re: BUG?: xdl_merge surprisingly does not recognize content conflict
Date: Thu, 15 Aug 2019 15:06:51 -0700	[thread overview]
Message-ID: <CABPp-BHupqJaJzK9yXxvTEPkuaoq_yW0ZJ7z0nZXODhaRdrYyg@mail.gmail.com> (raw)
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.

  reply	other threads:[~2019-08-15 22:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-15 22:03 Elijah Newren
2019-08-15 22:06 ` Elijah Newren [this message]
2019-08-16 16:51 ` Junio C Hamano
2019-08-16 19:26   ` Elijah Newren
2019-08-16 18:40 ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CABPp-BHupqJaJzK9yXxvTEPkuaoq_yW0ZJ7z0nZXODhaRdrYyg@mail.gmail.com \
    --to=newren@gmail.com \
    --cc=git@vger.kernel.org \
    --subject='Re: BUG?: xdl_merge surprisingly does not recognize content conflict' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).