The Merge Status Dialog

Top  Previous  Next

The Merge Status dialog is used to analyze changes performed to a common base revision and to merge the changes into a single file. If the TFS client is installed on your computer, then the DiffMerge tool supplied by Microsoft is used for difference analysis and for merge conflict management. Otherwise, the ComponentSoftware CSDiff tool is used.



The Merge Status dialog contains the following sections:

View / Compare

·

Press the buttons with the 'file image' to view the revision.

·

Press the buttons with the 'magnifying glass' to compare the two revisions pointed at by the arrows by using the CSDiff tool, or user custom tool.

Merge Status

·

Press 'View Merge Output' to view the result after merge, including any conflicts which may have occurred.

Actions

·

Visual Merge - Use the CSDiff tool, or DiffMerge tool, to merge changes and resolve conflicts visually.

·

Raw Merge - Merge changes using classical GNU RCS merge. This is useful for advanced users who wish to use alternative methods for merge handling.

·

Use TFS version - Use the head revision from TFS and disregard the Origin system's revision.

·

Use Origin version - Use the head revision from Origin system and disregard the TFS's revision.

Press 'Go!' to perform the selected action.