Tagged: conflict-markers
| 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 |