Resolving conflicts with CVS Server

1. Modify the project.
   

   Modified project

2. Click Commit button on the Teamwork Toolbar.
3. In Commit dialog, you may found some shapes or model elements show with red icon. This indicate there is conflict when commit, it is caused by someone modified the same content and commit after you checkout. You can review the current value, original value (the value when you checkout), and conflict value (the value changed by other users). And dialog preview is disabled until you resolve the conflict.
   

   Commit with conflicts

   Below is a description of buttons or fields in dialog box.

   Button/Field Description Move to the previous conflict in element tree. Move to the next conflict in element tree. Overwrite all conflicts. Revert all conflicts. Reset all conflicts. Overwrite the selected conflict in tree. Revert the selected conflict in tree. Reset the selected conflict in tree. Select the previous change in tree. Select the next change in tree. Current Name The value of name of the committing/updating copy. Original Name The value of name of the original copy. Conflict Name The value of name of the server copy. Last Modified The user who modified last time. Conflict Revision The revision that cause conflict with the committing/updating action. [Overwrite] Click on overwrite the conflict selected in tree. [Revert] Click on revert the conflict selected in tree.

   Description of buttons in Commit dialog box

4. Select the conflict element, click Overwrite selected conflicts button on the toolbar to overwrite other user's change.
   

   Overwrite selected conflicts

   
   Or click Revert selected conflicts to revert your own changes.
   

   Revert selected conflicts

   
   You can also click Overwrite all conflicts or Revert all conflicts to overwrite or revert all conflicts at once.
   

   Overwrite/Revert all conflicts

5. After resolve conflict, the preview will be enabled to visualize the final result.
   

   Preview resolved conflict

6. You can change your mind by click Reset selected conflicts or Reset all conflicts button. Then overwrite or revert the conflict again.
   

   Reset conflicts

7. After all conflicts was resolved, you can now input comment and click OK button to commit.