Skip to content

Commit 5b61c66

Browse files
committed
oops; forgot format
1 parent b88ea17 commit 5b61c66

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

doc/contributing/maintaining-V8.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ $ git node v8 backport a51f429
243243

244244
? Resolve merge conflicts and enter 'RESOLVED' ‣
245245
```
246+
246247
Resolve conflicts by opening another terminal and staging resolutions
247248
to the merge conflicts. Once you fixed the conflicts, return to
248249
`git-node` and enter `RESOLVED`.

0 commit comments

Comments
 (0)