Merge Projects

Merging

When merging a branch back to the origin project, Document Object changes in the branch are added to the origin. If any conflicts exist between changes in the origin and the branch, they will be displayed to you and you can decide which version to use; i.e., the origin change or the branch change.

Note that the following elements are not merged back to the origin:

• Test Runs

• Signatures

• Trace Tables

• Queries

• Charts

• Tags

• Locked Document Objects

• Snapshots

• Reviews

• Users and User Groups

Template Paths – The Template path for the original and the branch project must be exactly the same at the time of merge.

Users – The users in both the original and branch project must be the same at the time of merge.

Note that the branch project still exists after merging. Although it is possible to continue working on the branch and merge additional changes back to the origin, only changes after the last merge occasion will be considered during a subsequent merge.

Note! At merge, the locking status of Document Objects in the target project are ignored i.e. when applicable locked objects are going to be overwritten by data from branched project during th emerge project. Therefore, it is best practice to make sure that no-one is working in to the target project when the merge action takes place.