| /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 |
| /plans/conflict-merge/implementation.md |
0.70 |
Implementation and decisions |
conflict-merge, implementation, decisions-log, diff3, merge-package, lcs, demarkus-mcp, merge-client-adapter, default-flip, create-only-conflict, mark-append |
| /plans/conflict-merge/motivation.md |
0.70 |
Motivation and non-goals |
conflict-merge, motivation, non-goals, optimistic-concurrency, content-loss, lost-content, diff3, mark-publish, mark-append, semantic-merge, server-side-merge |
| /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 |