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 <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Danielle Adams <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Franziska Hinkelmann <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Shelley Vohr <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Dec 21, 2020 · c3ec90d · c3ec90d
1 parent 7a34452
commit c3ec90d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/doc/guides/releases.md b/doc/guides/releases.md
@@ -544,7 +544,13 @@ $ git cherry-pick v1.x^
 ```
 
 Git should stop to let you fix conflicts. Revert all changes that were made to
-`src/node_version.h`. If there are conflicts in `doc` due to updated `REPLACEME`
+`src/node_version.h`:
+
+```console
+$ git checkout --ours HEAD -- 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
 not already one.