Skip to content

Commit

Permalink
doc: mention cherry-pick edge-case on release
Browse files Browse the repository at this point in the history
PR-URL: #44408
Reviewed-By: Ruy Adorno <ruyadorno@google.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
RafaelGSS committed Sep 5, 2022
1 parent 048e440 commit 8e41dbb
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions doc/contributing/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8e41dbb

Please sign in to comment.