Merge Error
From Dontopedia, the open, paraconsistent wiki. (Last updated 2026-06-06.)
Merge Error has 13 facts recorded in Dontopedia across 2 references, with 1 live disagreement.
Mostly:error reason(2), presupposes existing local changes(1), rdf:type(1)
Maturity scale
raw canonical shape-checked rule-derived certifiedOther facts (13)
The long tail: predicates that appear too rarely to warrant their own section. Filter or scroll to find a specific one. Each row links to its source.
| Predicate | Value | Ref |
|---|---|---|
| Error Reason | Your local changes to the following files would be overwritten by merge | [2] |
| Error Reason | untracked working tree files would be overwritten by merge | [2] |
| Presupposes Existing Local Changes | Repository State | [1] |
| Rdf:type | Error | [2] |
| Error Message | Merge failed: Command failed | [2] |
| Command Executed | /usr/bin/git merge arbiter/create-a-homepage-file-with-do-mj4ft5it --no-ff -m Merge arbiter/create-a-homepage-file-with-do-mj4ft5it: Self-edit by ajaxdavis | [2] |
| Conflicting File | src/index.ts | [2] |
| Suggested Action for Conflict | Please commit your changes or stash them before you merge | [2] |
| Untracked Conflicting File | src/web/server.ts | [2] |
| Suggested Action for Untracked | Please move or remove them before you merge | [2] |
| Result | Aborting | [2] |
| Strategy | ort | [2] |
| Strategy Outcome | failed | [2] |
Timeline
Timeline axis is valid_time — when each source says the fact was true in the world, not when Dontopedia learned about it. Retracted rows are kept for provenance; coloured stripes indicate the context kind.
References (2)
ctx:discord/blah/omega-debug/part-54ctx:discord/blah/omega-debug/30- full textomega-debug-30text/plain2 KB
doc:agent/omega-debug-30/daf29b8a-1271-4168-8d7f-0ba0f40eee18Show excerpt
[2025-12-13 15:14] omega [bot]: ... GitHub-like aesthetic 2. **`src/web/pages/home.ts`** - Homepage with full documentation - Hero section with Omega Arbiter branding - Core Features grid (Transport Abstraction, AI-Powered Decisions…
See also
Keep researching
Missing something or suspicious of what's here? Kick off a research session — a Claude agent will investigate, cite its sources, and file new facts into a dedicated context you can review before accepting into the shared view.