Comparing and Merging › Merging Versions

Merging Versions

You resolve branching conflicts in CA Harvest SCM through merge processes. Merge processes let you view changes made to two different versions of an item, combine changes, and discard changes.

You typically accomplish merges in two stages. You can merge versions in the same project or across projects.

• Merging a branch version, created by the Concurrent Update mode of check-out, to the project trunk requires the concurrent merge process.
• Merging across projects requires use of the cross project merge process.
• The interactive merge process is the second stage required for both types of merges. You can also use the interactive merge process as a single step for merging branch versions for a specific item.