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

Re: [PATCH v3 0/6] [doc] Add new page on merge conflicts

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 12, 2026, 18:37 UTC
Message-ID
<xmqqbj8y7okv.fsf@gitster.g>
In-Reply-To
<xmqqse2a7pgo.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
> I had some comments on diff3 in [1/6]; everything else looked good.
Here is a restatement of my [1/6] review in a squashable patch form.

The second hunk arond l.77 replaces "code" with "lines", as not everybody using Git are writing program code, which is not what I mentioned earlier. There are parts that talk about programs and code, while other parts that talk about lines, so the mixture is already there, but I think this part does not have to be specific to code, but just applicable to anything that is line oriented.

The main part of this change is the updated diff3 example. It reveals that the situation was different from naive interpretation of an earlier (ambiguous) example showed. This should help readers appreciate the extra information diff3 format supplies.

 Documentation/gitmergeconflicts.adoc | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)
diff --git c/Documentation/gitmergeconflicts.adoc w/Documentation/gitmergeconflicts.adoc
index 3c6eaaddf8..eeeeac85c0 100644
--- c/Documentation/gitmergeconflicts.adoc
+++ w/Documentation/gitmergeconflicts.adoc
@@ -60,8 +60,9 @@ MERGE CONFLICT MARKERS
 When there's a merge conflict, Git will update the conflicted file
 to include merge conflict markers `<<<<<<<`, `=======`, and `>>>>>>>`.
 For example, here's a merge conflict where both sides edited a list of
-fruits in different ways -- one side added "cherry" and the other side
-added "banana":
+fruits in different ways, and ended up in different states.  One side
+has "banana" but not "cherry", and the other side has "cherry", but
+not "banana".
 
 ----
 FRUITS = [
@@ -76,8 +77,8 @@ FRUITS = [
 ]
 ----
 
-The code from one side of the merge conflict is between `<<<<<<<` and
-`=======`, and the code for the other side is between `=======` and
+The lines from one side of the merge conflict are between `<<<<<<<` and
+`=======`, and the lines from the other side are between `=======` and
 `>>>>>>>`. See <<ours,"OURS" AND "THEIRS">> below for a full explanation
 of which side is which.
 
@@ -121,8 +122,8 @@ FRUITS = [
 ]
 ----
 
-Then you might edit that part of the code like this,
-which includes the fruits from both sides of the conflict:
+Then you might edit that part of the code like this, to take
+all the fruits from both sides of the conflict:
 
 ----
 FRUITS = [
@@ -208,15 +209,15 @@ 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.
+This extra context can make it easier to understand what's
+happening in a merge conflict and avoid mismerges.
 
 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.
 
 With this view, you can see that both sides fixed a spelling
-mistake in "mango", and each added one fruit to the list.
+mistake in "mango", and each removed one fruit from the list.
 
 ----
 FRUITS = [
@@ -225,15 +226,24 @@ FRUITS = [
     "cherry",
     "mango",
 ||||||| 1c22e48
+    "banana",
+    "cherry",
     "mangoooo",
 =======
-    "banana",
     "mango",
 >>>>>>> add-fruit
     "orange",
 ]
 ----
 
+In the default format, you would see this conflict as shown before,
+i.e., "one side has 'banana', the other side has 'cherry', everything
+else is the same".  But presented this way, we would realize that the
+conflict resolution to keep "banana" and "cherry" we showed earlier
+was incorrect.  Rather, we want to drop "banana", and "cherry" and
+keep the "mango" with corrected spellings.  The `diff3` format is more
+unambiguous by being more verbose.
+
 [NOTE]
 ================================
 `zdiff3` is an alternative to `diff3` that makes the merge conflict
Previous: Junio C HamanoNext: Julia Evans via GitGitGadget
Message 86 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.