diff --git a/doc/contributing/releases.md b/doc/contributing/releases.md index 7f20f623f3fa7e..3d3b7b99be4dd7 100644 --- a/doc/contributing/releases.md +++ b/doc/contributing/releases.md @@ -710,7 +710,7 @@ repository. ```console $ git checkout main $ git pull upstream main -$ git cherry-pick v1.x^ +$ git cherry-pick --strategy-option=diff-algorithm=patience v1.x^ ``` Git should stop to let you fix conflicts.