Merge folders to combine one or more folders into one folder. A folder can be a set of item revisions in a folder, project, or baseline.
To merge folders:
In the Project Merge Tool content window, select an item revision or folder that is in conflict.
To resolve the conflict, do one of the following:
Select Actions | <state>
where <state> depends on the item or folder you have selected. For example, Select Modification or Select Addition.
Select Actions | Resolve Conflicts
The Merge Tool starts and you can resolve conflicts between two files.
NOTE When you are merging a combination of baselines and projects, the Project Merge Tool determines which revision is the common ancestor and which are the derivatives based on the pedigree. This may not be the same as the order in which the baseline and projects were specified as parameters to the Project Merge Tool. For example, if a baseline was specified as the ancestor but a particular item revision in the baseline was determined to be a derivative, it would be passed as a derivative when calling the file merge tool.
Repeat steps 1 and 2 until all conflicts are resolved and the target contains the correct files and directories.
If you have Auto Merge disabled, select all the non-conflicting files you want in the target.
Select File | Save Target.
Related Topics