Getting started with Three-way Merge

The main benefit of Three-way Merge is as a conflict resolution tool when merging collections containing Simcenter Amesim models. Thus, the main method for accessing the tool is by starting a branch merging operation which results in a conflict.

Figure 367: Conflict state

To launch Three-way Merge, select Custom resolution, then Edit conflicts from the Resolve conflict menu item:

Figure 368: Custom resolution

However, you can also launch Three-Way Merge from a command line, much in the same way as Model Comparison. The syntax in this case is as follows:

Copy

AmeDiff.bat			
	-M (or --merge)		Launch Three-way Merge
	--left 	Model1.ame	The model to be used as local or mine in the merge operation
	--base 	Model2.ame	The model to be used as base in the merge operation
	--right 	Model3.ame	The model to be used as remote or theirs in the merge operation
	--output	Model4.ame	The model to be created as the output of the merge operation
	[OPTIONAL] --label-left 	"Label1"	The label to be displayed with mine
	[OPTIONAL] --label-base	"Label2"	The label to be displayed with base
	[OPTIONAL] --label-right 	"Label3"	The label to be displayed with theirs