doc: ensure to revert node_version changes

PR-URL: #44760 Reviewed-By: Ruy Adorno <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Geoffrey Booth <[email protected]>
nodejs · Sep 26, 2022 · 8b53339 · 8b53339
1 parent 3474cd8
commit 8b53339
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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