resolve

abstract fun resolve(local: Resource, remote: Resource): ConflictResolutionResult

Parameters

local

The modified resource on the client.

remote

The latest version of the resource downloaded from the remote server.