Dimensions allows individual files to be worked on in parallel. This means that the same file can be modified by many people at the same time, resulting in branches that each contain different versions or derivatives. At some point these derivative files need to be combined into a single new target file containing all the changes. This is called merging.
Merging can involve item revisions stored in Dimensions CM and/or local workfiles. The versions of a file involved in a merge consist of:
An ancestor. This is the common version of the file from which the different branches originated, and with which they are all being compared.
A target. This is the output file containing the resulting contents of the merged files.
A starting revision/file. If this is an item revision, it is the revision on whose branch the target file will be added on completion of the merge.
Other derivatives. These are the revisions or files that have been created in parallel and are being compared with the common ancestor.
Dimensions uses a Merge/Difference tool to help you carry out this process. It provides a visual means of comparing the contents of a number of files, identifying the differences and conflicts, and in the case of a merge operation, allowing you to select different lines individually for inclusion in the target.
When different versions are compared line-by-line with a common original version, the possibilities for each line are:
Added
Deleted
Changed
Unchanged.
When more than two files are compared, it is necessary to choose one of the versions as the common reference, referred to as the common ancestor, against which all other files (derivatives) are compared. If you want to merge these files back into a single version, referred to as the target, you will need to manually resolve the conflicts between them. A conflict occurs where a line has been added, deleted, or changed differently between different derivatives. You will need to decide, for each conflict, which version to include in the target. You can use item files or files in your work area for this process.
The Dimensions CM desktop client uses the Serena Merge Tool for this purpose.
Related Topics