Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: make explicit reverting node_version.h changes #36461

Closed
wants to merge 2 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! doc: make explicit reverting node_version.h changes
  • Loading branch information
richardlau authored Dec 10, 2020
commit af347d6837299dbf79b2dbb2e9f8a1c1848753bf
2 changes: 1 addition & 1 deletion doc/guides/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down