fixed: fix automatic merging behaviour

2026-06-08 11:24:06 +03:00 · 2026-06-08 09:04:12 +01:00
2 changed files with 9 additions and 1 deletions
--- a/src/lib
+++ b/src/lib
--- a/updates.md
+++ b/updates.md
@@ -3,6 +3,14 @@ Since 19th July, 2025 (beta1 in 0.25.0-beta1, 13th July, 2025)

 The head note of 0.25 is now in [updates_old.md](https://github.com/vrtmrz/obsidian-livesync/blob/main/updates_old.md). Because 0.25 got a lot of updates, thankfully, compatibility is kept and we do not need breaking changes! In other words, when get enough stabled. The next version will be v1.0.0. Even though it my hope.

+## Unreleased
+
+8th June, 2026
+
+### Fixed
+
+- Prevented the automatic merging of conflicted revisions when one of the revisions has been deleted, which was causing deleted files to reappear (#911).
+
 ## 0.25.73

 4th June, 2026