From df3dcd1bd13cc638d032cd9f38c683d3ea2fdb13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Fri, 5 Jul 2024 13:36:00 +0200 Subject: [PATCH] doc: fix releases guide for recent Git versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/53709 Reviewed-By: Richard Lau Reviewed-By: Tobias Nießen Reviewed-By: Marco Ippolito Reviewed-By: Beth Griggs Reviewed-By: Matteo Collina Reviewed-By: James M Snell --- doc/contributing/releases.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/releases.md b/doc/contributing/releases.md index 9fd8d51fa071a0..71ae6dcb265ec6 100644 --- a/doc/contributing/releases.md +++ b/doc/contributing/releases.md @@ -819,7 +819,7 @@ Git should stop to let you fix conflicts. Revert all changes that were made to `src/node_version.h`: ```bash -git checkout --ours HEAD -- src/node_version.h +git restore --source=upstream/main src/node_version.h ```