public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-05-11 18:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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).

Browse Source 
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
vorotamoroz
2026-04-25 17:22:25 +09:00
parent b5d054f259
commit 31bd270869
3 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/features/HiddenFileCommon/JsonResolvePane.svelte
View File

@@ -30,7 +30,8 @@
type JSONData = Record<string | number | symbol, any> | [any];
const docsArray = $derived.by(() => {
if (docs && docs.length >= 1) {
// The merge pane compares two revisions, so guard against incomplete input before reading docs[1].
if (docs && docs.length >= 2) {
if (keepOrder || docs[0].mtime < docs[1].mtime) {
return { a: docs[0], b: docs[1] } as const;
} else {