Jonathan White c1e9f45df9 Introduce synchronize merge method ... * Create history-based merging that keeps older data in history instead of discarding or deleting it * Extract merge logic into the Merger class * Allows special merge behavior * Improve handling of deletion and changes on groups * Enable basic change tracking while merging * Prevent unintended timestamp changes while merging * Handle differences in timestamp precision * Introduce comparison operators to allow for more sophisticated comparisons (ignore special properties, ...) * Introduce Clock class to handle datetime across the app Merge Strategies: * Default (use inherited/fallback method) * Duplicate (duplicate conflicting nodes, apply all deletions) * KeepLocal (use local values, but apply all deletions) * KeepRemote (use remote values, but apply all deletions) * KeepNewer (merge history only) * Synchronize (merge history, newest value stays on top, apply all deletions)		2018-09-30 09:36:39 -04:00
..
TestClock.cpp	Introduce synchronize merge method	2018-09-30 09:36:39 -04:00
TestClock.h	Introduce synchronize merge method	2018-09-30 09:36:39 -04:00