neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-08 22:33:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle source conflict in merge policy

Browse Source
This commit is contained in:
naturecodevoid
2023-04-09 13:32:22 -07:00
parent 82e8fb7389
commit 3d46a3069a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AltStoreCore/Model/MergePolicy.swift
View File

@@ -51,9 +51,14 @@ open class MergePolicy: RSTRelationshipPreservingMergePolicy
print("[ALTLog] Resolving AppVersion context-level conflict. Most likely due to migrating from pre-AppVersion model version.", primaryAppVersion)
}
case is Source where conflict.conflictingObjects.count == 2:
// Use the first one
let second = conflict.conflictingObjects[1]
second.managedObjectContext?.delete(second)
default:
// Unknown context-level conflict.
assertionFailure("MergePolicy is only intended to work with database-level conflicts.")
assertionFailure("MergePolicy is only intended to work with database-level conflicts. \(conflict.conflictingObjects.map { obj in obj.description }.joined(separator: ", "))")
}
}