0.5.5

manifest-beta.json

@@ -1,7 +1,7 @@
 {
   "id": "remotely-save",
   "name": "Remotely Save",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "minAppVersion": "0.13.21",
   "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
   "author": "fyears",

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "remotely-save",
   "name": "Remotely Save",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "minAppVersion": "0.13.21",
   "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
   "author": "fyears",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "remotely-save",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "This is yet another sync plugin for Obsidian app.",
   "scripts": {
     "dev2": "node esbuild.config.mjs --watch",

src/sync.ts

@@ -1172,7 +1172,7 @@ const dispatchOperationToActualV3 = async (
       r.key
     );
     if (conflictAction === "smart_conflict") {
-      if (isMergable(r.remote!)) {
+      if (isMergable(r.local!)) {
         await clearFileContentHistoryByVaultAndProfile(
           db,
           vaultRandomID,