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

Re: [PATCH v4 1/6] doc: add new gitmergeconflicts man page

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 23, 2026, 19:14 UTC
Message-ID
<xmqqtsmc44c1.fsf@gitster.g>
In-Reply-To
<486a77dbd78e111f66f8878594a30974c2abe53f.1792764293.git.gitgitgadget@gmail.com>
"Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 7 quoted lines
> Things to potentially improve in future docs revisions:
>
> - The explanation of zdiff3 is unsatisfying. It would be good if we
>   could have a clear example of a case where zdiff3 is helpful and a
>   case where it's harmful, and if we could give a better sense for
>   the reasons why users are actually choosing zdiff3 over diff3
>   (or the reverse) in real life.

Is this a stale comment? I think you reduced this to just a side note that says `shoter but ambiguous`, which is probably good enough.

Show 23 quoted lines
> +[[diff3]]
> +DIFF3
> +-----
> +
> +By default, Git doesn't include the original code when formatting
> +a merge conflict. To include the original code, you can set the
> +configuration option `merge.conflictstyle` to `diff3`.
> +This extra context can make it much easier to understand what's
> +happening in a merge conflict.
> +
> +Here's an example of what a merge conflict would look like when using
> +`diff3`. There's an extra section (between `|||||||` and `=======`)
> +with the original code.
> +
> +----
> +FRUITS = [
> +    "apple",
> +<<<<<<< HEAD
> +    "cherry",
> +    "mango",
> +||||||| 1c22e48
> +	"banana",
> +	"cherry",

These two should be indented with spaces the same way as all the other lines in this list.

Show 11 quoted lines
> +    "mangoooo",
> +=======
> +    "banana",
> +    "mango",
> +>>>>>>> add-fruit
> +    "orange",
> +]
> +----
> +
> +With this view, you can see that both sides fixed a spelling
> +mistake in "mango", and each removed one fruit to the list.
", and each removed one from the list", I think.
> +This makes it more clear how to resolve the merge conflict: since one
> +side removed `banana` and one side removed `cherry`, it would probably
> +make sense to remove both from the list, like this:

The reason why removal becomes the correct resolution is not just one side removed, but the fact that the other side did not touch what was removed by one side. The "indifference by the other" is what makes one's removal the preferred action by the semantics of 3-way merge.

So, let's rewrite the reason a bit more tightly.
    since one side removed `banana` while the other side did not
    touch, and the same happend to `cherry`, it makes sense to
    remove both from the list ...
or somethig like that.

Other than that, I did not see anything questionable in the 6 patches.

Previous: Julia Evans via GitGitGadgetNext: Julia Evans
Message 89 of 109 in “[doc] Add new page on merge conflicts”
  1. 0/7 [doc] Add new page on merge conflictsJulia Evans via GitGitGadget, Sep 24, 2026
  2. 1/7 [doc] Add new gitmergeconflicts man pageJulia Evans via GitGitGadget, Sep 24, 2026
  3. Junio C HamanoSep 24, 2026
  4. Junio C HamanoSep 24, 2026
  5. Patrick SteinhardtSep 30, 2026
  6. Julia EvansSep 30, 2026
  7. Junio C HamanoSep 30, 2026
  8. Patrick SteinhardtOct 1, 2026
  9. Julia EvansOct 1, 2026
  10. Junio C HamanoOct 2, 2026
  11. Julia EvansOct 5, 2026
  12. Junio C HamanoOct 5, 2026
  13. Julia EvansOct 5, 2026
  14. 2/7 [doc] git-merge: link to new merge conflicts guideJulia Evans via GitGitGadget, Sep 24, 2026
  15. D. Ben KnobleSep 25, 2026
  16. Julia EvansSep 25, 2026
  17. Junio C HamanoSep 25, 2026
  18. Ben KnobleSep 25, 2026
  19. Junio C HamanoSep 25, 2026
  20. Ben KnobleSep 25, 2026
  21. Julia EvansOct 2, 2026
  22. Junio C HamanoOct 2, 2026
  23. Julia EvansOct 2, 2026
  24. Junio C HamanoOct 2, 2026
  25. D. Ben KnobleOct 3, 2026
  26. Junio C HamanoOct 3, 2026
  27. Patrick SteinhardtSep 30, 2026
  28. 3/7 [doc] git-rebase: link to new merge conflicts guideJulia Evans via GitGitGadget, Sep 24, 2026
  29. 4/7 [doc] git-revert: link to new merge conflicts guideJulia Evans via GitGitGadget, Sep 24, 2026
  30. 5/7 [doc] git-cherry-pick: link to new merge conflicts guideJulia Evans via GitGitGadget, Sep 24, 2026
  31. Junio C HamanoSep 25, 2026
  32. Julia EvansSep 28, 2026
  33. Junio C HamanoSep 28, 2026
  34. 6/7 [doc] git-pull: link to new merge conflicts guideJulia Evans via GitGitGadget, Sep 24, 2026
  35. 7/7 [doc] ignore conflict markers in gitmergeconflicts.adocJulia Evans via GitGitGadget, Sep 24, 2026
  36. Junio C HamanoOct 7, 2026
  37. Julia EvansOct 9, 2026
  38. Junio C HamanoSep 24, 2026
  39. Jeff KingSep 24, 2026
  40. Julia EvansSep 28, 2026
  41. Jeff KingSep 29, 2026
  42. Junio C HamanoSep 29, 2026
  43. D. Ben KnobleSep 25, 2026
  44. Julia EvansOct 2, 2026
  45. D. Ben KnobleOct 3, 2026
  46. Julia EvansOct 5, 2026
  47. D. Ben KnobleOct 6, 2026
  48. D. Ben KnobleOct 6, 2026
  49. 0/6 [doc] Add new page on merge conflictsJulia Evans via GitGitGadget, Oct 9, 2026
  50. 1/6 doc: add new gitmergeconflicts man pageJulia Evans via GitGitGadget, Oct 9, 2026
  51. Junio C HamanoOct 9, 2026
  52. Julia EvansOct 9, 2026
  53. Junio C HamanoOct 9, 2026
  54. Junio C HamanoOct 10, 2026
  55. 2/6 doc: git-merge: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 9, 2026
  56. Junio C HamanoOct 9, 2026
  57. 3/6 doc: git-rebase: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 9, 2026
  58. Junio C HamanoOct 9, 2026
  59. 4/6 doc: git-revert: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 9, 2026
  60. Junio C HamanoOct 9, 2026
  61. 5/6 doc: git-cherry-pick: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 9, 2026
  62. Junio C HamanoOct 9, 2026
  63. Julia EvansOct 9, 2026
  64. 6/6 doc: git-pull: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 9, 2026
  65. Junio C HamanoOct 9, 2026
  66. Junio C HamanoOct 9, 2026
  67. Julia EvansOct 9, 2026
  68. Ben KnobleOct 9, 2026
  69. Junio C HamanoOct 9, 2026
  70. 0/6 [doc] Add new page on merge conflictsJulia Evans via GitGitGadget, Oct 12, 2026
  71. 1/6 doc: add new gitmergeconflicts man pageJulia Evans via GitGitGadget, Oct 12, 2026
  72. Junio C HamanoOct 12, 2026
  73. Julia EvansOct 14, 2026
  74. Junio C HamanoOct 14, 2026
  75. Patrick SteinhardtOct 13, 2026
  76. Julia EvansOct 14, 2026
  77. 2/6 doc: git-merge: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 12, 2026
  78. 3/6 doc: git-rebase: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 12, 2026
  79. 4/6 doc: git-revert: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 12, 2026
  80. 5/6 doc: git-cherry-pick: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 12, 2026
  81. Patrick SteinhardtOct 13, 2026
  82. 6/6 doc: git-pull: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 12, 2026
  83. D. Ben KnobleOct 12, 2026
  84. Julia EvansOct 12, 2026
  85. Junio C HamanoOct 12, 2026
  86. Junio C HamanoOct 12, 2026
  87. 0/6 [doc] Add new page on merge conflictsJulia Evans via GitGitGadget, Oct 23, 2026
  88. 1/6 doc: add new gitmergeconflicts man pageJulia Evans via GitGitGadget, Oct 23, 2026
  89. Junio C HamanoOct 23, 2026
  90. Julia EvansOct 26, 2026
  91. Junio C HamanoOct 26, 2026
  92. Julia EvansOct 26, 2026
  93. Junio C HamanoOct 26, 2026
  94. 2/6 doc: git-merge: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 23, 2026
  95. 3/6 doc: git-rebase: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 23, 2026
  96. 4/6 doc: git-revert: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 23, 2026
  97. 5/6 doc: git-cherry-pick: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 23, 2026
  98. 6/6 doc: git-pull: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 23, 2026
  99. Ben KnobleOct 23, 2026
  100. Junio C HamanoOct 23, 2026
  101. Junio C HamanoOct 23, 2026
  102. Junio C HamanoOct 23, 2026
  103. 0/6 [doc] Add new page on merge conflictsJulia Evans via GitGitGadget, Oct 26, 2026
  104. 1/6 doc: add new gitmergeconflicts man pageJulia Evans via GitGitGadget, Oct 26, 2026
  105. 2/6 doc: git-merge: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 26, 2026
  106. 3/6 doc: git-rebase: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 26, 2026
  107. 4/6 doc: git-revert: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 26, 2026
  108. 5/6 doc: git-cherry-pick: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 26, 2026
  109. 6/6 doc: git-pull: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 26, 2026

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.