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.
This commit is contained in:
vorotamoroz committed 2026-07-23 02:00:24 +00:00
1 parent 8d82a3a00c
commit d784799969
17 files changed
+728 -44

No files matched your search

+7
View File
@@ -25,4 +25,11 @@ describe("LiveSync-owned translation catalogue", () => {
expect(translateLiveSyncMessage("Active Remote Type")).toBe(englishMessageTranslator("Active Remote Type"));
});
it("uses LiveSync-owned provisional English without extending Commonlib's message contract", () => {
expect($msg("This file has unresolved conflicts.")).toBe("This file has unresolved conflicts.");
expect(translateLiveSyncMessage("This file has unresolved conflicts.")).toBe(
"This file has unresolved conflicts."
);
});
});