From 662f574c5b8066fe840d87189f92e8ffcf71ad82 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 16 Dec 2022 21:07:33 +0000 Subject: [PATCH] doc: reduce likelihood of mismerges during release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 PR-URL: https://github.com/nodejs/node/pull/45864 Reviewed-By: Ruben Bridgewater Reviewed-By: Michaël Zasso Reviewed-By: Rafael Gonzaga --- 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 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.