4 Commits

Author	SHA1	Message	Date
vorotamoroz	07cba4ce83	Keep unreadable revisions for explicit repair	2026-07-24 16:15:46 +00:00
vorotamoroz	f8f11f358a	Handle multiple conflict revisions deterministically	2026-07-23 06:38:16 +00:00
vorotamoroz	d784799969	Improve postponed conflict resolution handling ... Keep unresolved conflicts visible after Not now, reopen them only on explicit requests, and clear stale warning and dialogue state when a replicated resolution arrives. Add typed provisional English messages, revision-tree regressions, specifications, and a focused Real Obsidian E2E.	2026-07-23 02:00:24 +00:00
vorotamoroz	f24c543dd3	Persist displayed branches through conflict operations	2026-07-22 16:01:57 +00:00