0.5.5

yeah a fix for the sync
2024-06-11 00:44:47 +08:00 · 2024-06-11 00:44:19 +08:00
4 changed files with 4 additions and 4 deletions
@@ -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",
@@ -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",
@@ -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",
@@ -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,
Author	SHA1	Message	Date
fyears	df0a0e2daa	0.5.5 Release A New Version / build (16.x) (push) Failing after 35s Details	2024-06-11 00:44:47 +08:00
fyears	c9080dae4e	yeah a fix for the sync	2024-06-11 00:44:19 +08:00