Open topic with navigation

Merging changelist files

You can merge files to compare, accept, or reject differences between files and combine the changes into a new file.

1. Choose Tools > Changelists.

The Changelists dialog box opens.

2. Select the file and click Merge.

The Merge dialog box opens.

3. Select Copy on server to merge changes with the latest version on the Surround SCM Server.

4. Click Advanced to select a branched file, historic file version, or unrelated file.

The Second File area expands with the following options:

• Branched file merges changes with a branched version. Select a file from the list.
• Historic version merges the current version with a specific historic version. Select the version from the list.
• Unrelated files merges the current version with any other file. Click Browse to select a file. See Merging unrelated files.

5. Select Merge should first attempt auto-merge to enable auto-merges.

You are only prompted to manually merge files if auto-merge fails.

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.

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

• If you want to check in the file, enter any comments then click Yes, check in file.
• If you want to keep the file checked out, click No, keep file checked out.