Commit fd971f5 1 parent 3112d5d commit fd971f5 Copy full SHA for fd971f5
File tree 1 file changed +6
-2
lines changed
1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -705,13 +705,17 @@ $ git pull upstream main
705
705
$ git cherry-pick v1.x^
706
706
```
707
707
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 ` :
710
711
711
712
``` console
712
713
$ git checkout --ours HEAD -- src/node_version.h
713
714
```
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
+
715
719
If there are conflicts in ` doc ` due to updated ` REPLACEME `
716
720
placeholders (that happens when a change previously landed on another release
717
721
branch), keep both version numbers. Convert the YAML field to an array if it is
You can’t perform that action at this time.
0 commit comments