git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: BUG?: xdl_merge surprisingly does not recognize content conflict

From
Elijah Newren <newren@gmail.com>
Date
Aug 15, 2019, 22:06 UTC
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:
Show 8 quoted lines
>
> 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.

Previous: Elijah NewrenNext: Junio C Hamano
Message 2 of 5 in “BUG?: xdl_merge surprisingly does not recognize content conflict”
  1. Elijah NewrenAug 15, 2019
  2. Elijah NewrenAug 15, 2019
  3. Junio C HamanoAug 16, 2019
  4. Elijah NewrenAug 16, 2019
  5. Jeff KingAug 16, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.