From 61f69fb8ac9193c5cfcba5e2ff67263c0576ff40 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Wed, 9 Dec 2020 17:40:08 +0000 Subject: [PATCH 1/2] doc: make explicit reverting node_version.h changes Add an explicit command to revert changes to `node_version.h` when cherry-picking the release commit to the `master` branch. --- 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..26a2515a35b7c7 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 -- 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. From af347d6837299dbf79b2dbb2e9f8a1c1848753bf Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 10 Dec 2020 14:30:43 +0000 Subject: [PATCH 2/2] fixup! doc: make explicit reverting node_version.h changes --- doc/guides/releases.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guides/releases.md b/doc/guides/releases.md index 26a2515a35b7c7..5444f2d364554e 100644 --- a/doc/guides/releases.md +++ b/doc/guides/releases.md @@ -547,7 +547,7 @@ Git should stop to let you fix conflicts. Revert all changes that were made to `src/node_version.h`: ```console -$ git checkout --ours -- src/node_version.h +$ git checkout --ours HEAD -- src/node_version.h ``` If there are conflicts in `doc` due to updated `REPLACEME`