sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve conflict_resolution docs

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-10-18 16:37:45 +02:00
parent 9688eb3a2c
commit 734fdd61f6
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docs/config.rst
View file

@ -70,9 +70,14 @@ Pair Section
collections = from b,from a # all in storage a + all in storage b collections = from b,from a # all in storage a + all in storage b
- ``conflict_resolution``: Optional, define how conflicts should be handled. A - ``conflict_resolution``: Optional, define how conflicts should be handled. A
conflict occurs when one item changed on both sides since the last sync. conflict occurs when one item (event, task) changed on both sides since the
Valid values are ``a wins`` and ``b wins``. By default, vdirsyncer will show last sync.
an error and abort the synchronization.
Valid values are:
- ``a wins`` and ``b wins``, where the whole item is taken from one side.
Vdirsyncer will not attempt to merge the two items.
- ``None``, the default, where an error is shown and no changes are done.
.. _storage_config: .. _storage_config: