public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-06-11 00:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #944 from vrtmrz/fix_911

Browse Source 
fixed: fix automatic merging behaviour
This commit is contained in:
vorotamoroz
2026-06-08 18:47:29 +09:00
committed by GitHub
parent c493fb6f66 d85d8bc5e4
commit 347e1fcee5
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib
+1 -1
Submodule src/lib updated: 76d91674c2...337f3c1c84
updates.md
+9 -1
View File
@@ -3,11 +3,19 @@ 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).
## Only CLI
8th June, 2026
- Added new remote database management commands: `remote-status`, `unlock-remote`, `lock-remote`, and `mark-resolved`.
- Added new remote database management commands: `remote-status`, `unlock-remote`, `lock-remote`, and `mark-resolved`.
## 0.25.73