list mirror (unofficial, one of many)
 help / color / Atom feed
From: Elijah Newren <>
To: Git Mailing List <>
Subject: Re: BUG?: xdl_merge surprisingly does not recognize content conflict
Date: Thu, 15 Aug 2019 15:06:51 -0700
Message-ID: <> (raw)
In-Reply-To: <>

On Thu, Aug 15, 2019 at 3:03 PM Elijah Newren <> 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 index

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:

  List information:

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

  git send-email \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:

 note: .onion URLs require Tor:

AGPL code for this site: git clone