From ddfa90cb49fe328ca0ca93c595b218a87a8031df 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 --- doc/contributing/releases.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/contributing/releases.md b/doc/contributing/releases.md index eb03be2a07de0e..1e0a369933c7e3 100644 --- a/doc/contributing/releases.md +++ b/doc/contributing/releases.md @@ -698,10 +698,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