Commit with VP Teamwork Server

Commit refers to the process of uploading local modifications to the server. As team members make changes in a project, they can share their works by committing those changes to the server. VP-UML can help to merge changes from working copy to server copy. During merging, a conflict may be caused when there is a contradiction between team members. Decision have to be made whether to keep the current modified copy (i.e. overwrite) or to accept others' copy (i.e. revert). All conflicts have to be solved before proceeding to commit.

To operate commit:

After entering VP-UML, select Teamwork > Commit... from the main menu to commit your modified copy to the server.

The Commit dialog box displays the changes to be committed to the server. Click OK to proceed.

The Commit dialog box

Overview of Commit dialog box

The Commit dialog box

No. Name Description  1  toolbar Select previous conflict: Select the previous conflict you made in current copy. Select next conflict: Select the next conflict you made in current copy when a conflict is found during committing. Overwrite all conflicts: Keep all modification you made in current copy when a conflict is found during committing. Revert all conflicts: Accept all modification other team members made previously and discard all your modification when a conflict is found during committing. Reset all conflicts: Cancel the decision you have just made for dealing with all conflicts when a conflict is found during committing. Overwrite selected conflicts: Keep the selected modification you made in current copy when a conflict is found during committing. Revert selected conflicts: Accept the selected modification other team members made in current copy when a conflict is found during committing. Reset selected conflicts: Cancel the decision you have just made for dealing with the select conflict(s) when a conflict is found during committing. Select previous change: Select the previous modification you have made in the sequence of list displaying in Display window. Select next change: Select the next modification you have made in the sequence of list displaying in Display window. 2 Filter Select a specific scope for previewing the to-be-committed project, including: All, Update from Server, Commit, Conflict, Created Elements, Modified Element and Deleted Elements. 3 Element Filter Select a specific scope for previewing the to-be-committed model elements, including: All, TaggedValue, TaggedValueContainer and UseCase. 4 Hide pmLastModified pmLastModified records the the current and original value. You can check this option, pmLast Modified won't be displayed on Diaplay window. 5 Display window It displays a specific scope for previewing the to-be-committed project/ model elements in accordance with the selection of Filter/ Element Filter. 6 Property view window It lists property name, current value, original value and last modified of the selected model element. 7 Project name It shows the name of current project. 8 Checkout revision It shows the number of current checkout revision. 9 Checkout time It shows the time for latest checkout. 10 Latest server revision It shows the number of latest revision in the server. 11 Edit the commit comment You can give a comment for your current commit by typing here. 12 Choose a previously entered comment You can search and select a comment that you entered previously in this drop-down menu. 13 OK Click OK to proceed committing. 14 Cancel Click Cancel to cancel committing and close the dialog box. 15 Help Click Help to get assistance from help system.

The description of Commit dialog box

The Preview tab of the Commit dialog box

No. Name Description 16  Preview Click it for previewing the selected model element(s). 17  Server preview window It displays the original revision in server for previewing. 18  Local modified preview window It displays the modified and to-be-committed revision for previewing.

The description of Preview tab in the Commit dialog box

Resolving conflict

When your modified copy conflicts with the copy others made previously during committing, you can resolve the conflict by clicking either Overwrite or Revert in the Commit dialog box.

Resolve conflict in the Commit dialog box

Choosing Overwrite means keeping your modified copy while choosing Revert refers to accept others' copy.

You can preview the choice you made by clicking Preview button. The left window shows the image before update while the right window shows the image after update. Click OK when you want to confirm the modification(s).

Preview before committing