Merge branch 'main' into cli_vaultpath

updates.md

@@ -3,19 +3,31 @@ 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.
 
-## CLI Only
+## Unreleased
 
 8th June, 2026
 
+### 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 (#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...
+
 ### Improved
 
+- Added new remote database management commands: `remote-status`, `unlock-remote`, `lock-remote`, and `mark-resolved`.
 - Decoupled the database directory path from the actual vault directory path using the `--vault` (or `-V`) option.
 
 ### Fixed (preventive)
+
 - Validated that the specified vault path exists and is indeed a directory before starting the CLI.
 - Integrated path resolution and validations for one-off commands (such as `'push'`, `'pull'`, `'cat'`, `'rm'`, `'info'`, and `'resolve'`) against the decoupled vault path instead of the database path.
 
-
 ## 0.25.73
 
 4th June, 2026