Expand description
memstead conflicts — the sanctioned door for git merge conflicts
in folder mems (backlog-sweep plan 07, decision 20).
A hand-committed folder mem lives in the user’s own git repository,
so an ordinary merge can write conflict markers into entity files —
at which point the file refuses to load and every other repair
route (git verbs, raw edits) is correctly blocked by the guards.
conflicts list shows what is conflicted; conflicts resolve
picks a side per entity through the engine — validated before it
lands, committed as an attributed, note-carrying mutation.
Structs§
- Args
- List and resolve git merge conflicts in folder-backed mems.