VersionControl.Provider.Merge

static function Merge(assets: AssetList, method: MergeMethod): Task;

static Task Merge(AssetList assets, MergeMethod method);

static def Merge(assets as AssetList, method as MergeMethod) as Task

Parameters

assets	The list of conflicting assets to be merged.
method	How to merge the assets.

This method will initiate a merge task handle merging of the conflicting assets.

An initial attempt of is made to make a simple merge automatically. If this fails the merge method decide if manual merge too will be spawned of not.