obsidian-livesync/src/features/HiddenFileCommon at 56a234e6d78b23f3bef0eda3c50e9ac6b6ae601d - obsidian-livesync - Git

public/obsidian-livesync

mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-06-10 16:30:15 +00:00

Files

T

History

vorotamoroz 31bd270869 Fixed: Hidden file JSON conflicts no longer keep re-opening and dismissing the merge dialogue before we can act, which fixes persistent unresolvable data.json conflicts in plug-in settings sync (related: #850 ).

Co-authored-by: Copilot <copilot@github.com>

2026-04-25 17:22:25 +09:00

..

JsonResolveModal.ts

## 0.25.43-patched-8

2026-02-20 14:28:28 +00:00

JsonResolvePane.svelte

Fixed: Hidden file JSON conflicts no longer keep re-opening and dismissing the merge dialogue before we can act, which fixes persistent unresolvable data.json conflicts in plug-in settings sync (related: #850 ).

2026-04-25 17:22:25 +09:00