Re: [PATCH v2 4/6] doc: git-revert: link to new merge conflicts guide
flat view
From: Junio C Hamano <hidden>
Date: 2026-10-09 18:24:12
"Julia Evans via GitGitGadget" [off-list ref] writes:
quoted hunk ↗ jump to hunk
From: Julia Evans <redacted> Signed-off-by: Julia Evans <redacted> --- Documentation/git-revert.adoc | 5 +++++ 1 file changed, 5 insertions(+)diff --git a/Documentation/git-revert.adoc b/Documentation/git-revert.adoc index ffba365e63..1edf98b9aa 100644 --- a/Documentation/git-revert.adoc +++ b/Documentation/git-revert.adoc@@ -31,6 +31,10 @@ both will discard uncommitted changes in your working directory. See "Reset, restore and revert" in linkgit:git[1] for the differences between the three commands. +If there have been new commits since the reverted commit, there may +be a merge conflict. See linkgit:gitmergeconflicts[7] +(or `git help mergeconflicts`) for a guide to handling merge conflicts. +
This is a strange thing to say. Is it worth special casing the revert of the tip commit that much? "Reverting a commit may resolt in a merge conflict" should be sufficient, I would think.
quoted hunk ↗ jump to hunk
OPTIONS ------- <commit>...::@@ -162,6 +166,7 @@ include::config/revert.adoc[] SEE ALSO -------- linkgit:git-cherry-pick[1] +linkgit:gitmergeconflicts[7] GIT ---