Merge two or more folders and resolve conflicts, with the result being a single folder. Folders can be projects or baselines, or folders/directories in a work area.
Upload rules need to be defined for any item types that will be added to the repository as a result of the merge.
You cannot merge the $GENERIC project.
To start the Project Merge Tool from the Dimensions CM desktop client:
Do one of the following:
|
If you want to ... |
Do this ... |
|
Base the merge on an entire project. |
Select the project as your current project, and select Tools | Merge |
|
Base the merge on a subfolder of a project. |
Select the subfolder of the project and select Project | Merge. |
|
Base the merge on a baseline. |
Select the baseline and select Baseline | Project | Merge. |
On the Ancestor tab of the Project Merge dialog box, from the Object Type list, select Baseline, File Based, or Project.
To specify the ancestor, do one of the following:
In the Specification field, type a project or baseline specification, or click Browse to find a project or a baseline.
In the Folder field, type a folder name, or click Browse to find a folder.
Click the Derivatives tab.
To specify a derivative, do the following:
a From the Object Type list, select Baseline, File Based, or Project, and do one of the following:
• In the Specification field, type a project or baseline specification, or click Browse to find a project or a baseline.
• In the Folder field, type a folder name, or click Browse to find a folder.
b Click Add. The derivative is added to the Object Type table.
c Repeat steps a and b for each folder you want to merge with the ancestor folder.
Click the Target tab.
To specify the target, from the Object Type list, select File Based or Project.
If you selected File Based, for the Folder field, type a folder name, or click Browse to find a folder.
If you selected Project, do one of the following:
For Specification, type a project specification.
Click Browse to find a project.
Click New Project to create a new project and
a On the General tab:
n Select the Product to which the project will belong
n Enter the Project ID
n Select a Type
n Enter a Description
b On the Options tab, enter the project options. For details, see About Project Options.
c On the Named Branches tab, enter any named branches and select the default branch.
d On the attributes tab, enter any attributes.
NOTE If you create a new target project, you need to set the Dimensions CM upload rules. For more information, see About Upload Rules.
Click OK. The target folder is not created until you resolved all the conflicts between the ancestors and the derivatives and save the folder in Project Merge Tool.
To start Project Merge Tool from the Windows command line:
Start the Dimensions CM desktop client or SCC (Source Code Control).
Select Start | Run.
In the Run dialog box, type one of the following:
projectmerge ancestor_dir derivative_dir -target dir
where:
ancestor_dir is the name of the ancestor folder.
derivative_dir is the name of the derivative folder. You can enter multiple folder names to compare.
-target dir is the location of the merged folder.
projectmerge -config file
where file is the name of the configuration file.
projectmerge -target dir
where dir is the location of the target folder.
In the Select Directories dialog box, type the directories you want to compare, or click Browse to find the directories. The first folder is the ancestor and the second folder is the derivative. You can only add one derivative folder.
Click OK.
The Project Merge Tool starts and you can merge the folders.
Related Topics
About Starting the Project Merge Tool
Starting Project Merge Tool to Compare Folders