Comparing and merging files
Before you check in file changes, you may need to review differences between the file in your working directory and the current version in Surround SCM. Diffing and merging files is crucial if you use non-exclusive check outs and other users make changes to the same files you are working with. This helps ensure all the correct changes are added to the file in Surround SCM.
Diff3 and Guiffy are the default diff/merge applications integrated with Surround SCM. You can configure different applications to diff and merge specific file types. See Setting diff/merge options.
You can perform the following tasks to compare and merge files.
- View file differences to compare the local file to a file version in Surround SCM and accept or reject differences between them.
- View image file differences to compare a local image file to a version in Surround SCM.
- Merge files to manually resolve issues when Surround SCM cannot automatically merge file versions.
- Run file differences reports to view the differences between two or more versions of a text file.