HSDK Class Descriptions › CaConcurrentMerge › void SetMergeRule( LPCTSTR szRule )

void SetMergeRule( LPCTSTR szRule )

Sets Rule for how to merge the versions of files in the package.

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

• MERGE_RULE_TRUNK_MERGE-Take the entire trunk version and ignore the version on the branch. This corresponds to the GUI TakeTrunk Version option.
• MERGE_RULE_BRANCH_MERGE-Take the entire branch version and ignore the version on the trunk. This corresponds to the GUI Take Branch Version option.
• MERGE_RULE_CONFLICT_TAG-Create a merge tag only if changes in branch and trunk conflict. This corresponds to the GUI Merge Aggressively option.
• MERGE_RULE_ALWAYS_TAG-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.

Owning Class

CaConcurrentMerge

Arguments

LPCTSTR szRule-the rule value

Return Value

None

Example

CaConcurrentMerge& rConcurrentMerge = rContext.GetConcurrentMerge(); rConcurrentMerge. SetMergeRule(MERGE_RULE_CONFLICT_TAG);

More information:

• HSDK Programming Fundamentals
• GetMergeRule