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

Automatically resolves GameCollection + GameControllerInputMapping conflicts

Browse Source
This commit is contained in:
Riley Testut 2019-09-19 13:29:51 -07:00
parent 50c96bc2ee
commit 1e350e1369
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

2
External/Harmony vendored

@ -1 +1 @@
Subproject commit 7f365faac01e3a2d562d747875fbd062be4acb5e
Subproject commit 4d7ba40073c8fed53fa92f7db07d75b4b8929a41