nodejs
diff --git a/Collapse file
‎doc/contributing/releases.md‎
Copy file name to clipboardExpand all lines: doc/contributing/releases.md
+6-2Lines changed: 6 additions & 2 deletions
Display the source diff
Display the rich diff b/Collapse file
‎doc/contributing/releases.md‎
Copy file name to clipboardExpand all lines: doc/contributing/releases.md
+6-2Lines changed: 6 additions & 2 deletions
Display the source diff
Display the rich diff
@@ -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