public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-07-26 14:32:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,561 Commits 36 Branches 399 Tags
658ad6dfe4e46810bd8775bbadbf9da7e8ddba28
Commit Graph

3 Commits

Author SHA1 Message Date
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