3-group-ios/GBA001
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automatically resolves Cheat + ControllerSkin sync conflicts

Browse Source
This commit is contained in:
Riley Testut 2023-06-27 18:58:41 -05:00
parent 750740ac16
commit 707116a39b
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Delta/Database/Model/Human/Cheat.swift
View File

@ -53,4 +53,9 @@ extension Cheat: Syncable
public var syncableLocalizedName: String? { public var syncableLocalizedName: String? {
return self.name return self.name
} }
public func resolveConflict(_ record: AnyRecord) -> ConflictResolution
{
return .newest
}
} }

5
Delta/Database/Model/Human/ControllerSkin.swift
View File

@ -129,4 +129,9 @@ extension ControllerSkin: Syncable
public var syncableLocalizedName: String? { public var syncableLocalizedName: String? {
return self.name return self.name
} }
public func resolveConflict(_ record: AnyRecord) -> ConflictResolution
{
return .newest
}
} }