Tagged: diff3
| Path | Importance | Title | Tags |
|---|---|---|---|
| /plans/conflict-merge.md | 0.65 | Plan: Conflict-Aware Merge in MCP Tools | plan, conflict-merge, mark-publish, mcp, diff3, merge, optimistic-concurrency, on-conflict, conflict-markers, versions, expected-version, agent-loop, client, content-loss, status:complete |
| /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 |