Commit 7ec097f
doc: mention cherry-pick edge-case on release
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>1 parent 4a40251 commit 7ec097f
1 file changed
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -698,10 +698,16 @@ placeholders (that happens when a change previously landed on another release | |||
| 698 | 698 | branch), keep both version numbers. Convert the YAML field to an array if it is | |
| 699 | 699 | not already one. | |
| 700 | 700 | ||
| 701 | + [It's possible that the `cherry-pick` step will end up adding and/or | ||
| 702 | + changing unwanted lines](https://github.com/nodejs/Release/issues/771), | ||
| 703 | + please validate the changes in `doc/` folder files before confirming/continuing | ||
| 704 | + the cherry-pick step. | ||
| 705 | + | ||
| 701 | 706 | Then finish cherry-picking and push the commit upstream: | |
| 702 | 707 | ||
| 703 | 708 | ```console | |
| 704 | 709 | $ git add src/node_version.h doc | |
| 710 | + $ git diff --staged src doc # read output to validate that changes shows up as expected | ||
| 705 | 711 | $ git cherry-pick --continue | |
| 706 | 712 | $ make lint | |
| 707 | 713 | $ git push upstream main | |
0 commit comments