Fix CoreData merge conflicts

FiveSheepCo · Sep 29, 2024 · ea66522 · ea66522
1 parent c5586c3
commit ea66522
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Sources/SwiftDataSync/Synchronizer/SDSSynchronizer.swift b/Sources/SwiftDataSync/Synchronizer/SDSSynchronizer.swift
@@ -86,6 +86,8 @@ public class SDSSynchronizer {
         })
         self.container = container
         let context = container.newBackgroundContext()
+        context.automaticallyMergesChangesFromParent = true
+        context.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
         self.context = context
         self.savedState = context.performAndWait({
             (try? context.fetch(SDSSynchronizerSavedState.fetchRequest()).first) ??