diff --git a/manifest.json b/manifest.json index bea2c84..ae7a00d 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "obsidian-livesync", "name": "Self-hosted LiveSync", - "version": "0.19.18", + "version": "0.19.19", "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 6cd2134..d1c2557 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "obsidian-livesync", - "version": "0.19.18", + "version": "0.19.19", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "obsidian-livesync", - "version": "0.19.18", + "version": "0.19.19", "license": "MIT", "dependencies": { "diff-match-patch": "^1.0.5", diff --git a/package.json b/package.json index ca41c77..acba7f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "obsidian-livesync", - "version": "0.19.18", + "version": "0.19.19", "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/updates.md b/updates.md index 96f85e4..5f93740 100644 --- a/updates.md +++ b/updates.md @@ -46,5 +46,11 @@ I hope you will give it a try. - 0.19.18 - Fixed: - Now the empty (or deleted) file could be conflict-resolved. +- 0.19.19 + - Fixed: + - Resolving conflicted revision has become more robust. + - LiveSync now try to keep local changes when fetching from the rebuilt remote database. + Local changes now have been kept as a revision and fetched things will be new revisions. + - Now, all files will be restored after performing `fetch` immediately. ... To continue on to `updates_old.md`.