VersionControl.Provider.Resolve
static function Resolve(assets: AssetList, resolveMethod: ResolveMethod): Task;
static Task Resolve(AssetList assets, ResolveMethod resolveMethod);
static def Resolve(assets as AssetList, resolveMethod as ResolveMethod) as Task
Parameters

assets The list of asset to mark as resolved.
resolveMethod How the assets should be resolved.
Description

Start a task that will resolve conflicting assets in version control.

When conflicting assets appear you can resolve it by using your own copy or the incoming copy. A third way of resolving the conflict is by first Provider.Merge() the assets and the resolve using the merged asset. Use the resolveMethod to flag what should be used.