| /plans/conflict-merge/design.md |
0.70 |
Conflict-aware merge design |
conflict-merge, design, on-conflict, merge, merge-candidate, merge-flow, diff3, agent-loop, agent-side-loop, conflict-markers, conflict-marker-format, response-shapes, publish-at-version, has-markers, expected-version, wire-level-impact, mark-publish |
| /journal/2026-05-05.md |
0.50 |
Journal — 2026-05-05 |
journal, conflict-merge, mark-publish, on-conflict, diff3, lcs, merge, mcp, optimistic-concurrency, property-test, client-internal-merge |