← All repositories

crossmate

A collaborative crossword app for iPhone and iPad

git clone https://code.inqk.net/crossmate.git


commit a924cf520146eb9edf6a80580dab74b8282b6c81
parent 1964589232e03b9a0bf2f2ff6c311759834802dd
Author: Michael Camilleri <[email protected]>
Date:   Wed, 20 May 2026 13:30:42 +0900

Change merge policy to avoid loading failure errors

Diffstat

MCrossmate/Persistence/PersistenceController.swift | 1+

1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/Crossmate/Persistence/PersistenceController.swift b/Crossmate/Persistence/PersistenceController.swift

@@ -47,6 +47,7 @@ final class PersistenceController {
         }
 
         container.viewContext.automaticallyMergesChangesFromParent = true
+        container.viewContext.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
 
         if !inMemory {
             backfillCachedSummaryFields()