Skip to content

Commit fd971f5

Browse files
committed
doc: ensure to revert node_version changes
PR-URL: #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>
1 parent 3112d5d commit fd971f5

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

doc/contributing/releases.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -705,13 +705,17 @@ $ git pull upstream main
705705
$ git cherry-pick v1.x^
706706
```
707707

708-
Git should stop to let you fix conflicts. Revert all changes that were made to
709-
`src/node_version.h`:
708+
Git should stop to let you fix conflicts.
709+
710+
Revert all changes that were made to `src/node_version.h`:
710711

711712
```console
712713
$ git checkout --ours HEAD -- src/node_version.h
713714
```
714715

716+
Even if there are no conflicts, ensure that you revert all the changes that were
717+
made to `src/node_version.h`.
718+
715719
If there are conflicts in `doc` due to updated `REPLACEME`
716720
placeholders (that happens when a change previously landed on another release
717721
branch), keep both version numbers. Convert the YAML field to an array if it is

0 commit comments

Comments
 (0)