Previous Topic: CaWConcurrentMerge

Next Topic: VersionDescription Property

CHSDK Class Descriptions › CaWConcurrentMerge › MergeRule Property

MergeRule Property

Gets or sets Rule for how to merge the versions of files in the package.

Syntax

object.MergeRule = [value]

Owning Class

CaWConcurrentMerge

Arguments

value - A string that represents the rule value.

Notes

The following are the allowable values for the Merge Rule. They are defined in an include file built into the project.

T

Take the entire trunk version and ignore the version on the branch. This corresponds to the GUI TakeTrunk Version option.

B

Take the entire branch version and ignore the version on the trunk. This corresponds to the GUI Take Branch Version option.

C

Create a merge tag only if changes in branch and trunk conflict. This corresponds to the GUI Merge Aggressively option.

A

Create a merge tag if there is any difference in the trunk and branch version at all. This corresponds to the GUI Merge Conservatively option.

Example

Dim objConcurrentMerge
Set objConcurrentMerge = objContext.GetConcurrentMerge()
objConcurrentMerge.MergeRule = “A”
 strMergeRule = objConcurrentMerge.MergeRule

More information: