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

This commit is contained in:
vorotamoroz
2026-06-08 10:55:47 +01:00
8 changed files with 533 additions and 7 deletions
+10 -1
View File
@@ -9,7 +9,16 @@ The head note of 0.25 is now in [updates_old.md](https://github.com/vrtmrz/obsid
### Fixed
- Fixed an issue where disabling hidden file synchronisation did not take effect, allowing non-target hidden files to continue to be processed and synchronised by replication or boot-sequence scan.
- Fixed an issue where disabling hidden file synchronisation did not take effect, allowing non-target hidden files to continue to be processed and synchronised by replication or boot-sequence scan (#941).
- 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
I should also consider the version numbering for the CLI...
- Added new remote database management commands: `remote-status`, `unlock-remote`, `lock-remote`, and `mark-resolved`.
## 0.25.73