public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-07-07 21:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into fix_conflict_issues

Browse Source
This commit is contained in:
vorotamoroz
2026-07-07 12:11:38 +00:00
parent dbcbf2c5ca 3f9cd67b1c
commit 6f9446f447
4 changed files with 123 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
updates.md
+2
View File
@@ -14,6 +14,8 @@ The head note of 0.25 is now in [updates_old.md](https://github.com/vrtmrz/obsid
- Fixed an issue where applying a newer database entry to storage could incorrectly preserve an older local file as a conflict (#994).
- Behaviour change:
- Local storage is preserved as a conflict when it may contain unsynchronised changes that are not represented in the revision history. A newer incoming text entry is applied without creating a conflict only when it clearly extends the existing local text.
- Fixed an issue where choosing Disable and then Overwrite in Hidden File Sync could silently skip hidden files, because the overwrite setup ran while hidden file synchronisation was still disabled (#989, PR #992).
- Hidden File Sync is now re-enabled before the Fetch, Overwrite, or Merge initialisation runs, instead of after it completes. If that initialisation fails, the setting may remain enabled.
## 0.25.79