diff options
| author | Rafael Gonzaga <rafael.nunu@hotmail.com> | 2022-09-23 19:33:12 +0300 |
|---|---|---|
| committer | Juan José Arboleda <soyjuanarbol@gmail.com> | 2022-10-11 22:45:28 +0300 |
| commit | 618c9c82606a69cee176bf403881eadbc18f70b2 (patch) | |
| tree | 0fd10a34d75ab5170afc46bf6f4eeb78c1993c44 /doc | |
| parent | 8b8d18ab4eeb791e87bcb80cdd90bcdf5db9db04 (diff) | |
doc: ensure to revert node_version changes
PR-URL: https://github.com/nodejs/node/pull/44760
Reviewed-By: Ruy Adorno <ruyadorno@google.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/contributing/releases.md | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/contributing/releases.md b/doc/contributing/releases.md index 76a4cdd5fb1..d6d4deee8b5 100644 --- a/doc/contributing/releases.md +++ b/doc/contributing/releases.md @@ -705,13 +705,17 @@ $ git pull upstream main $ git cherry-pick v1.x^ ``` -Git should stop to let you fix conflicts. Revert all changes that were made to -`src/node_version.h`: +Git should stop to let you fix conflicts. + +Revert all changes that were made to `src/node_version.h`: ```console $ git checkout --ours HEAD -- src/node_version.h ``` +Even if there are no conflicts, ensure that you revert all the changes that were +made to `src/node_version.h`. + If there are conflicts in `doc` due to updated `REPLACEME` 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 |