Conflict resolution: manually selecting and resolving conflicts

The Sync Work Area action in the Rational® Synergy GUI identifies the files it finds in conflict. However, the GUI does not resolve the conflict unless you instruct it to do so.

Any work area conflicts are shown in the Work Area Conflicts dialog. You can select specific files in conflict and resolve each conflict in a specified manner. For more information about resolving conflicts using this method, use the Rational Synergy Information Center for the specific type of conflict resolution.

Similarly, the ccm reconcile -show command in the Rational Synergy CLI identifies the files it finds in conflict. However, the GUI does not resolve the conflict. Use the ccm reconcile -udb or ccm reconcile -uwa command to resolve specific files, directories, or projects.


Feedback