From c3ec90d23c92a953a78996d55c7cb6e637464c40 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Wed, 9 Dec 2020 17:40:08 +0000 Subject: [PATCH] doc: make explicit reverting node_version.h changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add an explicit command to revert changes to `node_version.h` when cherry-picking the release commit to the `master` branch. PR-URL: https://github.com/nodejs/node/pull/36461 Refs: https://github.com/nodejs/node/pull/36460 Refs: https://github.com/nodejs/node/pull/36385 Reviewed-By: Colin Ihrig Reviewed-By: Gireesh Punathil Reviewed-By: Danielle Adams Reviewed-By: Myles Borins Reviewed-By: Michael Dawson Reviewed-By: Franziska Hinkelmann Reviewed-By: Michaël Zasso Reviewed-By: Luigi Pinca Reviewed-By: Shelley Vohr Reviewed-By: Rich Trott --- doc/guides/releases.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/guides/releases.md b/doc/guides/releases.md index fbbb43b4e3e7a4..5444f2d364554e 100644 --- a/doc/guides/releases.md +++ b/doc/guides/releases.md @@ -544,7 +544,13 @@ $ git cherry-pick v1.x^ ``` Git should stop to let you fix conflicts. Revert all changes that were made to -`src/node_version.h`. If there are conflicts in `doc` due to updated `REPLACEME` +`src/node_version.h`: + +```console +$ git checkout --ours HEAD -- 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 not already one.