Commit c3ec90d
doc: make explicit reverting node_version.h changes
Add an explicit command to revert changes to `node_version.h` when
cherry-picking the release commit to the `master` branch.
PR-URL: #36461
Refs: #36460
Refs: #36385
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Danielle Adams <adamzdanielle@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent 7a34452 commit c3ec90d
1 file changed
Lines changed: 7 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -544,7 +544,13 @@ $ git cherry-pick v1.x^ | |||
| 544 | 544 | ``` | |
| 545 | 545 | ||
| 546 | 546 | Git should stop to let you fix conflicts. Revert all changes that were made to | |
| 547 | - `src/node_version.h`. If there are conflicts in `doc` due to updated `REPLACEME` | ||
| 547 | + `src/node_version.h`: | ||
| 548 | + | ||
| 549 | + ```console | ||
| 550 | + $ git checkout --ours HEAD -- src/node_version.h | ||
| 551 | + ``` | ||
| 552 | + | ||
| 553 | + If there are conflicts in `doc` due to updated `REPLACEME` | ||
| 548 | 554 | placeholders (that happens when a change previously landed on another release | |
| 549 | 555 | branch), keep both version numbers. Convert the YAML field to an array if it is | |
| 550 | 556 | not already one. | |
0 commit comments