Note:
| · | Files with the 'Automatic' status may either be merged using the Diff tool or merged automatically. To merge these files automatically, simply leave these files and press 'OK' in the 'File Merge' dialog when all other conflict files have been resolved.
|
| · | Files with the 'Conflicts' status must be merged using the Diff tool. To merge such file, select it and click Merge....
|
| · | Files which have the 'Manual' status cannot be merged with ComponentSoftware tools and must be resolved using other means. This may happen when the same binary file is changed on both systems.
|
|
The File Merge dialog contains the following buttons:
| · | 'Merge...' - Open the Merge Status dialog to view and merge differences between the different revisions of the file.
|
| · | 'Merge Status...' - Open the Merge Status dialog to view changes made between the different revisions of the file.
|
Note: The 'OK' button will only become enabled once all files containing the 'Conflict' status have been resolved. Files with the 'Automatic' status will automatically be merged when the 'OK' button is pressed.