Use Project Merge Tool to merge folders

Merge two or more folders and resolve conflicts, with the result being a single folder. Folders can be projects, baselines, or folders in a work area.

You cannot merge the $GENERIC project. You need to define upload rules for any item types that are added to the repository during the merge.

Merge folders in desktop client

You can launch the Project Merge Tool from the desktop client.

To run Project Merge Tool from the desktop client:

  1. Based on the task you're performing, do one of the following:

    Task Description
    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.

    The Project Merge dialog box opens.

  2. On the Ancestor tab, select Baseline, File Based, or Project from the Object Type list, and specify the ancestor:

    Field Description
    Specification Enter a project or baseline specification, or browse to find a project or a baseline.
    Folder Enter a folder name, or browse to find a folder.

  3. To specify a derivative, select the Derivatives tab. From the Object Type list, select Baseline, File Based, or Project, and provide the following details:

    Field Description
    Specification Enter a project or baseline specification, or browse to find a project or a baseline.
    Folder Enter a folder name, or browse to find a folder.

    Click Add. The derivative is added to the Object Type table. Repeat for each folder you want to merge with the ancestor folder.

  4. To specify the target, select the Target tab. From the Object Type list, select an option, File Based or Project.

  5. If you selected File Based, in the Folder field, enter a folder name, or browse to find a folder.

  6. If you selected Project, in the Specification field, enter a project specification, or browse to find a project.

    To create a project, click New Project and specify its details. For details, see Create a project.

    Note: If you create a new target project, you need to set the Dimensions CM upload rules. For details, see About upload rules.

  7. 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.

Back to top

Merge folders from Windows command line

You can use the Windows command line to run the Project Merge Tool and merge folders.

To run Project Merge Tool from Windows command line:

  1. Start the Dimensions CM desktop client or SCC (Source Code Control).

  2. Select Start > Run.

  3. In the Run dialog box, enter one of the following commands:

    • 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.

      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.

  4. In the Select Directories dialog box, enter the folders to compare, or browse to find the folders. The first folder is the ancestor and the second folder is the derivative. You can add only one derivative folder.

  5. Click OK. The Project Merge Tool starts, and you can merge the folders.

Back to top

See also: