The CSDiff tool may be used for difference analysis merge conflict management. You may also configure a 3rd party analysis tool or merge tool that will be called by CS-RCS on any file type. For more information on CSDiff, see Using the CSDiff File Comparison Tool in CS-RCS Tools.
|
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 - When merging branch changes to the trunk:
|
|
|
| · | Visual Merge - Use the CSDiff tool, or user custom tool, to merge changes and resolve conflicts visually. For more information, see Resolving Conflicts in the Using the CSDiff File Comparison Tool chapter in CS-RCS Tools.
|
| · | 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 branch version - Retrieve the last revision archived in branch. This will ignore all changes made on the trunk. Make sure to review all changes before checking-in this revision to the repository. You may use the Reject change command of the CSDiff tool to incorporate any change checked-in to the trunk. For more information, see Accepting and Rejecting Changes in the Using the CSDiff File Comparison Tool chapter in CS-RCS Tools..
|
| · | Use trunk version - Retrieve the last revision archived in trunk. This will ignore all changes made on the branch. You must add the desired changes manually.
|
|
|
| Actions - When working in CVS mode:
|
|
|
| · | Visual Merge - Use the CSDiff tool, or user custom tool, to merge changes and resolve conflicts visually. For more information, see Resolving Conflicts in the Using the CSDiff File Comparison Tool chapter in CS-RCS Tools.
|
| · | 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 archived version - Retrieve the last revision archived in the repository and undo all local changes. It is recommended to copy the work file to a backup folder before confirming this action.
|
| · | Use work version - Ignore changes checked-in to the repository. Make sure to review all changes before checking-in this revision to the repository. You may use the Reject change command of the CSDiff tool to incorporate any change checked-in to the repository. For more information, see Accepting and Rejecting Changes in the Using the CSDiff File Comparison Tool chapter in CS-RCS Tools.
|
|
|
| Press 'Go!' to perform the selected action.
|
|
|