We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent b88ea17 commit 5b61c66Copy full SHA for 5b61c66
doc/contributing/maintaining-V8.md
@@ -243,6 +243,7 @@ $ git node v8 backport a51f429
243
244
? Resolve merge conflicts and enter 'RESOLVED' ‣
245
```
246
+
247
Resolve conflicts by opening another terminal and staging resolutions
248
to the merge conflicts. Once you fixed the conflicts, return to
249
`git-node` and enter `RESOLVED`.
0 commit comments