Compare commits

...

2 Commits

Author SHA1 Message Date
3dbd7fc445 doc : remove extra whitespace 2026-01-30 17:14:35 +01:00
10a79554d3 synchroniser : use prefer instead of force
When doing a forced synchronisation use the prefer directive instead of
force. This makes unison choose the remote version in case of conflicts
only and not for every change. This allows the add subcommand to be used
for adding a file to the sync (that is already present remotly) as well
as adding a brand new file from the local machine (after creating it or
downloading from somewhere for example).
2026-01-30 17:06:55 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -17,7 +17,7 @@ Unisync tries to solve two problems that are often solved separately but never t
Unisync solves this problem by placing each file on your local machine but with only the selected files and folders being physically present on your drive,
the others are replaced by symbolic links pointing to a directory that is mounted from your server.
See this
See this
:ref:`example_how_it_works`.
.. _unison: https://github.com/bcpierce00/unison

View File

@@ -232,7 +232,7 @@ class Synchroniser:
command.append(f"BelowPath {path}")
if force:
command.append("-force")
command.append("-prefer")
command.append(remote_root)
command.append("-batch")