Note:
| - | Files which have the 'Manual' status cannot be merged with ComponentSoftware tools and must be resolved using other means (see Perform Manual Merges earlier in this chapter).
|
| - | Files with the 'Automatic' status may either be merged using the CSDiff 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.
|
The File Merge dialog contains the following buttons:
| · | 'Merge...' - Open the CSDiff tool in Edit Mode in order to accept or reject all merged changes and to resolve all conflicts. It enables you to accept or reject any change. For more information, see Resolving Conflicts in the Using the CSDiff File Comparison Tool chapter in CS-RCS Tools.
|
|
|
| Tip: Within CSDiff, you may execute the Review | Accept All if you want to accept all changes. CSDiff will perform all automatic merges and will then loop through conflict sections and assist you in solving the conflicts.
|
|
|
| · | 'Merge Status...' - Open the Merge Status dialog to view changes made between the different revisions of the file. You may access the CSDiff tool, or alternative merge options, from this mode as well.
|
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.