From 5b4ae3703012d726bc50c44bdfb52d882b772128 Mon Sep 17 00:00:00 2001
From: vorotamoroz <vrtmrz@gmail.com>
Date: Tue, 22 Oct 2024 10:08:20 +0100
Subject: [PATCH] 0.24.0.dev-rc6

---
 manifest-beta.json                                | 2 +-
 package-lock.json                                 | 4 ++--
 package.json                                      | 2 +-
 src/features/HiddenFileCommon/JsonResolveModal.ts | 5 ++++-
 updates.md                                        | 7 +++++++
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/manifest-beta.json b/manifest-beta.json
index 0754a4b..93a389b 100644
--- 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
index 5cdffb4..262de85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "obsidian-livesync",
-    "version": "0.24.0.dev-rc5",
+    "version": "0.24.0.dev-rc6",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "obsidian-livesync",
-            "version": "0.24.0.dev-rc5",
+            "version": "0.24.0.dev-rc6",
             "license": "MIT",
             "dependencies": {
                 "@aws-sdk/client-s3": "^3.645.0",
diff --git a/package.json b/package.json
index 10a4edf..cbf35e0 100644
--- 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
index 4b9a466..90369a6 100644
--- 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
index a6003ba..56ff6a9 100644
--- 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