File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Expand file tree Collapse file tree 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
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 to revert all the changes that were
717+ made to ` src/node_version.h ` .
718+
715719If there are conflicts in ` doc ` due to updated ` REPLACEME `
716720placeholders (that happens when a change previously landed on another release
717721branch), 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