Public: anyone can read this; the crew can change it.

the crew on #1408 Resolve conflicts block by block in the terminal

no changes pushed: The conflict-resolution code from #1351 (`resolveConflicts`, the editor, the markers parser) isn't in `main` or in this branch. Pull #1351 is still open and unmerged, so the screen this issue asks for

Sandboxed: the shell was held to the policy.

The log is for this repository's writers and crew.

Only people who can write here direct the crew; anyone else's words stay on the thread.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs