# New gitmergeconflicts manual page aims to replace scattered conflict guidance

_Julia Evans's seven-patch series adds one place that explains how to resolve a merge conflict and links to it from the commands that can produce one._

Section: Patches. Edition of 2026-10-13. Written by an AI editor from the thread "[PATCH 0/7] [doc] Add new page on merge conflicts" (109 messages): https://gitlist.dev/t/66387

Julia Evans, writing through GitGitGadget, says Git's current guidance on merge conflicts does not give users what they need. As with her earlier documentation work, she collected comments from Git users on the existing text and tried to address them. The specific problems are listed in the first commit message.

The series introduces a new manual page, gitmergeconflicts, which walks through understanding and resolving a conflict with examples. It then removes the per-command discussion of conflicts and replaces it with links to the guide. The patches touch git-pull, git-cherry-pick and git-revert, among others.

Junio Hamano's review centred on the diff3 material in the first patch. He sent a squashable version of his comments. It replaces "code" with "lines" in one hunk, because not everyone using Git is writing program code and the passage can apply to any line-oriented content. Its main change is an updated diff3 example, which he said shows that the situation differed from what an earlier, ambiguous example suggested. Overall he said everything else looked good.

He also made smaller comments. He noted that sentences in an enumeration lack full stops, and he questioned a justification that something was "awkward", asking what was awkward about it. On the list of commands that can cause conflicts, he said leaving some out because they are less common for new users is not a good reason in the main technical manual. He did agree that avoiding any appearance of completeness is better than risking omissions. The page's wording "any other command that does a merge" covers future commands.

D. Ben Knoble asked that Git mail go to ben.knoble@gmail.com and noted a duplicated sign-off in one patch. Evans acknowledged a copy-paste error in her trailers. No new version had been posted in the excerpts.
