Resolving File Differences from a View Compare/Merge Session

If you have content differences between two text files, you can open File Compare/Merge directly from the View Compare/Merge session to resolve the differences. You can also change the action from Merge to Overwrite, Mark As Resolved, or Ignore.

To resolve differences in text file contents in View Compare/Merge, do the following:

1. Start a View Compare/Merge session using the View Compare/Merge Wizard. By default, the View Compare/Merge window opens in the Merge Perspective. Stay in this perspective.
2. Select a file with differences (having a merge status of either Resolved or Unresolved).

3. Click the Property tab in the lower pane.

   The <File Content> property is displayed in the Property pane with boldface type since it has differences.

4. Right-click in the row for the <File Content> property and choose an action to resolve the conflict. Choose Use Source to use the version of the file in the source view, Use Target to use the version in the target view, or Merge to open File Compare/Merge to compare and merge the contents.

   Tip: To quickly specify a resolution, double-click the Source or Target column for the <File Content> property to use that value for the Merged column. You can also double-click the Merged column for the <File Content> property to open File Compare/Merge to merge the files.