Chapter 5 - Committing a Project

The checkin project function allows you to commit the project changes (that you have made to the local project) to the Teamwork Server.

The commit project function is enabled only if the project is opened through the Teamwork Client.

To commit project:

1. Open the Teamwork Client. The way of opening a project vary with the product that you are using. Read Chapter 3 for how to run the Teamwork Client.

2. Perform one of the following:

   • Select Action > Checkin Project from the menu.

     Figure 5.1 - To commit a Teamwork Project

   • Click on the Checkin Project button on the toolbar.
   This shows the Commit Project dialog box.
3. Enter a description before committing. Click OK to proceed with checking the models to be committed.

   Figure 5.2 - The Commit Project dialog box

4. In the Commit Models(s) dialog box, resolve any conflict, then click OK to proceed with committing the changes to the server. More about resolving conflicts will be explained later in this chapter.

   Figure 5.3 - The Commit Model(s) dialog box

You can also use menu or toolbar to commit project, the methods vary with the product you are using, which are described below.

VP-UML, DB-VA (standalone), BP-VA, AG

Perform one of the following:

• Select Tools > Teamwork > Commit... from the main menu.
• Click on the Commit Project button on the toolbar.

SDE

DBVA with IDE

Conflict Resolution

When you commit the changes to the server, it may cause a conflict. A conflict occurs when the changes you made cause conflicts with the changes made by and committed by another team member. The Commit Model(s) dialog box, shows during the commit, provide all the functions you need to resolve conflicts.

To identify and resolve a conflict:

1. Find out a conflict by performing any of the following:
   • Select an item with the cross sign added. The cross sign indicates that there is a conflict for that item.

     Figure 5.4 - A conflict occurs

   • Click the Select next conflict button on the function bar.

     Figure 5.5 - To advance to the next conflict, if any

   This shows the detail of changes on the right-hand side of the dialog box.

   Figure 5.6 - Information about the conflict.

   Here are some common fields that describe the changes:

   Field	Description
   Name	The updated name of the affected model, in the local copy.
   Original Name	The name of the affected model before changed, in the local copy.
   Conflict Name	The updated name of the affected model, in the remote copy.
   Value	The updated value of the affected property, in the local copy.
   Original Value	The value of the affected property before changed, in the local copy.
   Conflict Value	The updated value of the affected property, in the remote copy.
   Version	The updated version of this change. It is Local by default. If the way of resolving this conflict is set to be Revert, the version will become the conflict version.
   Conflict Version	The version of project, stored in server, that causes conflict with the commit.

   Table 5.3

2. After a conflict is identified, you need to either overwrite or to revert the modification. Commit will not proceed when there exists an unresolved conflict.

   There are two buttons under the description of change, Overwrite and Revert. To overwrite the modifications made by other team members, click Overwrite. To apply the modification made by other team members, click Revert.

Visual Paradigm International Limited Website: www.visual-paradigm.com E-mail: support@visual-paradigm.com