We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 7a34452 commit c3ec90dCopy full SHA for c3ec90d
doc/guides/releases.md
@@ -544,7 +544,13 @@ $ git cherry-pick v1.x^
544
```
545
546
Git should stop to let you fix conflicts. Revert all changes that were made to
547
-`src/node_version.h`. If there are conflicts in `doc` due to updated `REPLACEME`
+`src/node_version.h`:
548
+
549
+```console
550
+$ git checkout --ours HEAD -- src/node_version.h
551
+```
552
553
+If there are conflicts in `doc` due to updated `REPLACEME`
554
placeholders (that happens when a change previously landed on another release
555
branch), keep both version numbers. Convert the YAML field to an array if it is
556
not already one.
0 commit comments