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

Re: [QUESTION] Git fails to detect merge conflict?

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Jul 2, 2019, 00:15 UTC
Message-ID
<20190702001528.GA94153@google.com>
In-Reply-To
<E42B8D46-0CA0-44E0-946F-8ADA96993629@atlassian.com>
Anton Ermolenko wrote:
> My understanding is that recursive merge here won't consider that situation to
> be a merge conflict as the changes have been introduced in different spots in
> the file.
Yes, that seems right to me.

Do you have more details about the context? What do these files look like? Are there other cues that we could use to discover that the customer intended the changes to conflict?

Thanks, Jonathan

Previous: Anton ErmolenkoNext: Anton Ermolenko
Message 2 of 3 in “[QUESTION] Git fails to detect merge conflict?”
  1. Anton ErmolenkoJul 1, 2019
  2. Jonathan NiederJul 2, 2019
  3. Anton ErmolenkoJul 5, 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.