diff --git a/vdirsyncer/sync/__init__.py b/vdirsyncer/sync/__init__.py index e8db4d1..292976e 100644 --- a/vdirsyncer/sync/__init__.py +++ b/vdirsyncer/sync/__init__.py @@ -136,9 +136,13 @@ async def sync( raise BothReadOnly if conflict_resolution == "a wins": - conflict_resolution = lambda a, b: a + + def conflict_resolution(a, b): + return a elif conflict_resolution == "b wins": - conflict_resolution = lambda a, b: b + + def conflict_resolution(a, b): + return b status_nonempty = bool(next(status.iter_old(), None))