From 8e41dbb81b0ab9b6dd7ce4e6118c3236b28a68fa Mon Sep 17 00:00:00 2001 From: RafaelGSS Date: Fri, 26 Aug 2022 10:55:14 -0300 Subject: [PATCH] doc: mention cherry-pick edge-case on release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/44408 Reviewed-By: Ruy Adorno Reviewed-By: Rich Trott Reviewed-By: Michaël Zasso Reviewed-By: James M Snell --- doc/contributing/releases.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/contributing/releases.md b/doc/contributing/releases.md index fc19207e51c3d3..8699c7e832302c 100644 --- a/doc/contributing/releases.md +++ b/doc/contributing/releases.md @@ -699,10 +699,16 @@ placeholders (that happens when a change previously landed on another release branch), keep both version numbers. Convert the YAML field to an array if it is not already one. +[It's possible that the `cherry-pick` step will end up adding and/or +changing unwanted lines](https://github.com/nodejs/Release/issues/771), +please validate the changes in `doc/` folder files before confirming/continuing +the cherry-pick step. + Then finish cherry-picking and push the commit upstream: ```console $ git add src/node_version.h doc +$ git diff --staged src doc # read output to validate that changes shows up as expected $ git cherry-pick --continue $ make lint $ git push upstream main