From 734fdd61f686073f6c4b52ca6da44346ed222abb Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sat, 18 Oct 2014 16:37:45 +0200 Subject: [PATCH] Improve conflict_resolution docs --- docs/config.rst | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/config.rst b/docs/config.rst index d4ab114..12acf55 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -70,9 +70,14 @@ Pair Section collections = from b,from a # all in storage a + all in storage b - ``conflict_resolution``: Optional, define how conflicts should be handled. A - conflict occurs when one item changed on both sides since the last sync. - Valid values are ``a wins`` and ``b wins``. By default, vdirsyncer will show - an error and abort the synchronization. + conflict occurs when one item (event, task) changed on both sides since the + last sync. + + 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: