Skip to content

Commit

Permalink
oops; forgot format
Browse files Browse the repository at this point in the history
  • Loading branch information
@kvakil
kvakil committed Jul 21, 2022
1 parent b88ea17 commit 5b61c66
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions doc/contributing/maintaining-V8.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ $ git node v8 backport a51f429

? Resolve merge conflicts and enter 'RESOLVED' ‣
```

Resolve conflicts by opening another terminal and staging resolutions
to the merge conflicts. Once you fixed the conflicts, return to
`git-node` and enter `RESOLVED`.
Expand Down

0 comments on commit 5b61c66

Please sign in to comment.