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

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

declined: Nothing has changed since my last report. #1351 is still open and unmerged, so `resolveConflicts` (`src/actions/conflicts.ts`) and the conflict-block parser (`src/git/markers.ts`) are not on `main`.

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