From fd9499bc5755c1cacfe9bc5d507edb1114fc4411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Wed, 3 Jul 2024 13:29:27 +0200 Subject: [PATCH] doc: fix releases guide for recent Git versions --- 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 ```