Merging unrelated files

You can merge unrelated files so they both contain the same information. This is helpful for merging similar files with different filenames or merging files that have a common ancestor but are in unrelated branches.

For example, changes are made to the XYZ.txt file in the Branch B/Common Files repository. Similar changes must also be made to the ABC.txt file in the Branch A/Code/Common Files repository. Merge the files to share the changes.

1. Select the file and choose Activities > Merge.

The Merge dialog box opens.

2. Click Advanced.

The Second File area expands with additional options.

3. Select Unrelated files.

4. Click Browse to select the file to merge from.

The Surround SCM Repository/File Browser opens.

5. Select a branch, repository, and file, and then click OK.

You return to the Merge dialog box.

6. Click Merge.

If the file to merge into is checked out, the merge application opens. If the file is not checked out, the Check Out Files dialog box opens.

If Surround SCM identifies a common ancestor for the selected files, a 3-way merge is performed. Otherwise, the 2-way diff application is used.

The files are merged and the merge application closes.

The Merge Check In dialog box opens if you checked out the file when starting the merge.

Click Yes, check in file to check in the file.
Click No, keep file checked out if you do not want to check in the file.