From 75a6ac03658e0699785808c5a28b9398985520b2 Mon Sep 17 00:00:00 2001 From: Rafael Gonzaga Date: Fri, 23 Sep 2022 13:33:12 -0300 Subject: [PATCH] doc: ensure to revert node_version changes --- doc/contributing/releases.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/contributing/releases.md b/doc/contributing/releases.md index 76a4cdd5fb16a1..e4b4accc1c53fe 100644 --- a/doc/contributing/releases.md +++ b/doc/contributing/releases.md @@ -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 to 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