0.24.0.dev-rc6

vrtmrz · Oct 22, 2024 · 5b4ae37 · 5b4ae37
1 parent 6d244a6
commit 5b4ae37
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/manifest-beta.json b/manifest-beta.json
@@ -1,7 +1,7 @@
 {
     "id": "obsidian-livesync",
     "name": "Self-hosted LiveSync",
-    "version": "0.24.0.dev-rc5",
+    "version": "0.24.0.dev-rc6",
     "minAppVersion": "0.9.12",
     "description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "author": "vorotamoroz",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.24.0.dev-rc5",
+    "version": "0.24.0.dev-rc6",
     "description": "Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
     "main": "main.js",
     "type": "module",

diff --git a/src/features/HiddenFileCommon/JsonResolveModal.ts b/src/features/HiddenFileCommon/JsonResolveModal.ts
@@ -32,9 +32,12 @@ export class JsonResolveModal extends Modal {
         this.hideLocal = hideLocal ?? false;
         void waitForSignal(`cancel-internal-conflict:${filename}`).then(() => this.close());
     }
+
     async UICallback(keepRev?: string, mergedStr?: string) {
+        if (this.callback) {
+            await this.callback(keepRev, mergedStr);
+        }
         this.close();
-        await this.callback?.(keepRev, mergedStr);
         this.callback = undefined;
     }
 

diff --git a/updates.md b/updates.md
@@ -23,6 +23,13 @@ Thank you, and I hope your troubles will be resolved!
 
 ---
 
+## 0.24.0.dev-rc6
+
+### Fixed
+
+-   We can resolve the conflict of the JSON file correctly now.
+-   This would be the final Release Candidate.
+
 ## 0.24.0.dev-rc5
 
 ### Improved