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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 9, 2026, 15:41 UTC
Message-ID
<xmqqse2evq2k.fsf@gitster.g>
In-Reply-To
<pull.2237.v2.git.1791547213.gitgitgadget@gmail.com>
"Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:
>  * [x] list reviewers in Reviewed-by
We may have a bit of misunderstanding in the process regarding this.
. `Reviewed-by:`, unlike the other trailers, can only be offered by the
  reviewers themselves when they are completely satisfied with the
  patch after a detailed analysis.
is how SubmittingPatches describes it.
ReviewingGuidelines.adoc tells reviewers
  If you are happy with the state of the patch series, explicitly
  indicate your approval (typically with a reply to the latest
  version's cover letter). Optionally, you can let the author know
  that they can add a "Reviewed-by: <you>" trailer if they resubmit
  the reviewed patch verbatim in a later iteration of the series.
For example, you added Ben and Patrick to the trailer of patch #1.
Show 14 quoted lines
> Range-diff vs v1:
>
>  1:  ad4853dc36 ! 1:  ab0344f947 [doc] Add new gitmergeconflicts man page
>      @@ Metadata
>       Author: Julia Evans <julia@jvns.ca>
>       
>        ## Commit message ##
>      -    [doc] Add new gitmergeconflicts man page
>      +    doc: add new gitmergeconflicts man page
> ...
>           Co-Authored-By: Marie Claire LeBlanc Flanagan <hello@marieflanagan.com>
>      +    Reviewed-by: D. Ben Knoble <ben.knoble+github@gmail.com>
>      +    Reviewed-by: Patrick Steinhardt <ps@pks.im>
>           Signed-off-by: Julia Evans <julia@jvns.ca>

Going back to the review thread of the previous round of this patch, https://lore.kernel.org/git/ar3sGzEknG2_Un_E@pks.im/

2026-09-24 14:44 ` [PATCH 1/7] [doc] Add new gitmergeconflicts man page Julia Evans via GitGitGadget 2026-09-24 20:36 ` Junio C Hamano 2026-09-24 22:04 ` Junio C Hamano 2026-09-30 13:19 ` Patrick Steinhardt 2026-09-30 19:53 ` Julia Evans 2026-09-30 20:37 ` Junio C Hamano 2026-10-01 5:14 ` Patrick Steinhardt [this message] 2026-10-01 12:10 ` Julia Evans 2026-10-02 17:58 ` Junio C Hamano 2026-10-05 16:54 ` Julia Evans 2026-10-05 17:22 ` Junio C Hamano 2026-10-05 19:11 ` Julia Evans

There are many messages that reply to the cover letter of the same iteration by Ben that gave a lot of good input, and I know Patrick also helped during the discussion to improve the document. I do not think neither of them said anything about reviewed-by.

We do want to credit the reviewers of previous rounds for their input that contributed to improvements in the latest round. But the way to do so is by mentioning them on "Helped-by:" you add.

Thanks.
Previous: Junio C HamanoNext: Julia Evans
Message 63 of 65 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. 2/6 doc: git-merge: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 9, 2026
  54. Junio C HamanoOct 9, 2026
  55. 3/6 doc: git-rebase: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 9, 2026
  56. Junio C HamanoOct 9, 2026
  57. 4/6 doc: git-revert: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 9, 2026
  58. Junio C HamanoOct 9, 2026
  59. 5/6 doc: git-cherry-pick: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 9, 2026
  60. Junio C HamanoOct 9, 2026
  61. 6/6 doc: git-pull: link to new merge conflicts guideJulia Evans via GitGitGadget, Oct 9, 2026
  62. Junio C HamanoOct 9, 2026
  63. Junio C HamanoOct 9, 2026
  64. Julia EvansOct 9, 2026
  65. Junio C HamanoOct 9, 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.