We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 3474cd8 commit 8b53339Copy full SHA for 8b53339
doc/contributing/releases.md
@@ -705,13 +705,17 @@ $ git pull upstream main
705
$ git cherry-pick v1.x^
706
```
707
708
-Git should stop to let you fix conflicts. Revert all changes that were made to
709
-`src/node_version.h`:
+Git should stop to let you fix conflicts.
+
710
+Revert all changes that were made to `src/node_version.h`:
711
712
```console
713
$ git checkout --ours HEAD -- src/node_version.h
714
715
716
+Even if there are no conflicts, ensure that you revert all the changes that were
717
+made to `src/node_version.h`.
718
719
If there are conflicts in `doc` due to updated `REPLACEME`
720
placeholders (that happens when a change previously landed on another release
721
branch), keep both version numbers. Convert the YAML field to an array if it is
0 commit comments