From f5953655c54916d0ce61fb00ef710d302bf915e6 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Thu, 3 Nov 2022 18:56:06 -0400
Subject: [PATCH] Set merge policy on managed object contexts and maybe fix
 some CoreData errors?

---
 Tusker/CoreData/MastodonCachePersistentStore.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Tusker/CoreData/MastodonCachePersistentStore.swift b/Tusker/CoreData/MastodonCachePersistentStore.swift
index 5910a7ea..fa4219cc 100644
--- a/Tusker/CoreData/MastodonCachePersistentStore.swift
+++ b/Tusker/CoreData/MastodonCachePersistentStore.swift
@@ -26,6 +26,7 @@ class MastodonCachePersistentStore: NSPersistentContainer {
         let context = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
         context.persistentStoreCoordinator = self.persistentStoreCoordinator
         context.automaticallyMergesChangesFromParent = true
+        context.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
         return context
     }()
     
@@ -33,6 +34,7 @@ class MastodonCachePersistentStore: NSPersistentContainer {
         let context = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
         context.persistentStoreCoordinator = self.persistentStoreCoordinator
         context.automaticallyMergesChangesFromParent = true
+        context.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
         return context
     }()
     
@@ -62,6 +64,7 @@ class MastodonCachePersistentStore: NSPersistentContainer {
         }
         
         viewContext.automaticallyMergesChangesFromParent = true
+        viewContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
         
         NotificationCenter.default.addObserver(self, selector: #selector(managedObjectsDidChange), name: .NSManagedObjectContextObjectsDidChange, object: viewContext)
     }