Skip to content
Permalink
Browse files
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>
  • Loading branch information
RafaelGSS committed Sep 26, 2022
1 parent 3112d5d commit fd971f5176a49cb951af30fd4ba7352e79935801
Showing 1 changed file with 6 additions and 2 deletions.
@@ -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

0 comments on commit fd971f5

Please sign in to comment.