threads / discuss / 29487

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

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

## tl;dr

One message between Jan 31, 2012 and Jan 31, 2012.

replies: 0people: 1as markdown or json

Marcin Wiśnicki· Jan 31, 2012, 10:55 UTC · lore

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.

$ 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.