Legacy Documentation: Version 4.6(go to latest)
Language: English
  • C#
  • JS
  • Boo

Script language

Select your preferred scripting language. All code snippets will be displayed in this language.

VersionControl.Provider.Merge

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

Parameters

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

Description

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.