kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

doc: git-cherry-pick: link to new merge conflicts guide 

Remove the discussion of merge conflicts and replace it with a link to
the guide.

Signed-off-by: Julia Evans <julia@jvns.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
seen
Julia Evans 2026-10-12 14:53:14 +00:00 committed by Junio C Hamano
parent 98931ee678
commit 0ef2da01fb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-cherry-pick.adoc
View File

@ -19,8 +19,7 @@ Given one or more existing commits, apply the change each one
introduces, recording a new commit for each. This requires your
working tree to be clean (no modifications from the HEAD commit).

When it is not obvious how to apply a change, the following
happens:
When a merge conflict happens:

1. The current branch and `HEAD` pointer stay at the last commit
successfully made.
@ -36,8 +35,8 @@ happens:
conflict markers `<<<<<<<` and `>>>>>>>`.
5. No other modifications are made.

See linkgit:git-merge[1] for some hints on resolving such
conflicts.
See linkgit:gitmergeconflicts[7] (or `git help mergeconflicts`)
for a guide to handling merge conflicts.

OPTIONS
-------
@ -259,6 +258,7 @@ $ git cherry-pick -Xpatience topic^ <4>
SEE ALSO
--------
linkgit:git-revert[1]
linkgit:gitmergeconflicts[7]

GIT
---