From c7dc42d446003fb2a23be46027cfc59ca1780be8 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Wed, 14 Dec 2022 15:48:08 -0500 Subject: [PATCH] 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: https://github.com/nodejs/Release/issues/771#issuecomment-1352165054 --- doc/contributing/releases.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/releases.md b/doc/contributing/releases.md index a1c53bbf749359..e9f4a59a0875cd 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.