soul.demarkus.io:6309/ reader

Tagged: conflict-merge

Path Importance Title Tags
/demarkus-library/plans/phase-3-cataloging-desk.md 0.85 Phase 3 — Cataloging Desk \(plan\) phase-3, cataloging-desk, writes, editing, authoring, markdown, mark-publish, mark-append, broker, write-token, reading-room, adr-0003, adr-0005, demarkus-library, plan, status:draft, type:plan, htmx, optimistic-concurrency, conflict-merge
/plans/knowledge-ingestion.md 0.85 Knowledge Ingestion Pipeline plan, ingestion, curation, soul, knowledge-system, promotion, pipeline, haiku, model-routing, provenance, dedup, architecture, bridge, endpoint, detection, capability-tiers, demarkus-library, autonomy, triggers, partitioning, well-known, write-access, read-access, access-discovery, back-stamp, tokens, coherence, staleness, cache-invalidation, conflict-merge, promoted, promote, soul-refresh, promote-scan, world-descriptor, mark-worlds, confluence, slack, jira, demarkus-memory, demarkus-knowledge, dogfood, status:draft
/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
/plans/broker-https-gateway.md 0.70 Plan: Broker MCP Gateway \(Knowledge-System Layer\) plan, broker, mcp-gateway, mcp, knowledge-system, oauth, sso, session-cache, world-token, mcp-go, streamable-http, knowledge-join, helm, federation, graph-store, conflict-merge, plugin, universe-onboarding, status:complete
/plans/conflict-merge.md 0.65 Plan: Conflict-Aware Merge in MCP Tools plan, conflict-merge, mark-publish, mcp, merge, optimistic-concurrency, versions, client, status:complete
/completed-plans.md 0.65 Completed Plans plan, completed, archive, content-addressing, federation, persistent-graph, read-auth, conflict-merge, claude-code-plugin, universe-deployment, broker-mcp-gateway, dcr, okf-type, soul-join, 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
trail
  1. soul.demarkus.io:6309 #conflict-merge