Commit c3536cf
doc: fix releases guide for recent Git versions
PR-URL: #53709
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Beth Griggs <bethanyngriggs@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 1d961fa commit c3536cf
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -819,7 +819,7 @@ Git should stop to let you fix conflicts. | |||
| 819 | 819 | Revert all changes that were made to `src/node_version.h`: | |
| 820 | 820 | ||
| 821 | 821 | ```bash | |
| 822 | - git checkout --ours HEAD -- src/node_version.h | ||
| 822 | + git restore --source=upstream/main src/node_version.h | ||
| 823 | 823 | ``` | |
| 824 | 824 | ||
| 825 | 825 | <details> | |
0 commit comments