|Important||This document may not represent best practices for current development, links to downloads and other resources may no longer be valid. Current recommended version can be found here. ArchiveDisclaimer|
How to: Reconcile File Differences
As described in, you can use either visual merging or manual merging for combining two file versions. This topic describes how to reconcile file differences using visual merge methods.
To reconcile file differences using visual merge:
Attempt a merge operation, as described in. Note that your merge operation must include the selection of visual merging for you to be able to see the visual merge window.
In the visual merge window, compare the database version in the left pane (marked SourceSafe) with your local version in the right pane. The bottom pane shows the differences that Visual SourceSafe has already been able to resolve.
In either pane, right-click to select a line and click Apply Change, Remove Change, or Apply Both Changes as needed.
Repeat step 3 for all the changes to reconcile. The merged version appears under Merged version in the bottom pane.
Click the Save button when you are satisfied with the merged version, and close the visual merge window. If there are any file differences that you could not reconcile, you must manually correct the files.