doc: reduce likelihood of mismerges during release

Switch to the `patience` git diff algorithm to reduce the likelihood of mismerges when the release commit is cherry-picked to the `main` branch. Refs: nodejs/Release#771 (comment) PR-URL: #45864 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
nodejs · Jan 1, 2023 · d500445aec5556f570ef3d2b38ed347a168b9863 · d500445
1 parent c9747f1
commit d500445aec5556f570ef3d2b38ed347a168b9863
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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.