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

Disable merge conflicts on on non-conflicting changes to subsequent lines

From
Marcin Wiśnicki <mwisnicki@gmail.com>
Date
Jan 31, 2012, 10:55 UTC
Message-ID
<CAC9GOO8GzvezgLH=2F735u=k+-5_1wMsZPbK4sy656dxMvCv3Q@mail.gmail.com>

If two subsequent lines are changed in different branches, merging will result in conflict event if there isn't any. Invoking merge tool will mark file as resolved automatically.

Is there a way to disable this behavior ? I want the merge to happen automatically if possible.

Message 1 of 1 in “Disable merge conflicts on on non-conflicting changes to subsequent lines”
  1. Marcin WiśnickiJan 31, 2012

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.