Update
Update is the process of refreshing your current copy by merging changes that others have made and committed previously to server. Similar to commit, update is a process of merging differences instead of overwriting. When any of your changes contradicts the changes others have made, you will be asked to resolve conflict. All conflicts have to be resolved before proceeding with updating. To update:
- Select Team > Utilities > Open Teamwork Client... from the toolbar.
- If the change you made contradicts the change made by another team member, this will result in a conflict. You must resolve all the conflicts in order to continue. For details, read the Resolving conflicts section below. Clear the conflicts, if any, and continue.
- The Update window displays the changes to be made upon updating. Click Update to proceed.
Overview of Update window
The Update window |
|
||||||||||||||||||||||||||||||||||||||||||||||||
The description of Update window |
Updating multiple projects
Instead of updating a single project, you can update multiple project files at the same time, for those listed in the Teamwork Client window as managed projects.
- Select Team > Utilities > Open Teamwork Client... from the toolbar.
- From the project list on the left hand side, select the projects to update.
- Right click on the selection and select Update... from the popup menu.
Resolving conflict
If the change you made contradicts the change made by another team member, this will result in a conflict. For example, your colleague has renamed a class from School to University and performed a commit and then you rename the same class to College and perform an update. This produces a conflict.
When a conflict occurs, you must resolve it in order to continue updating . You have to resolve conflict by overwriting or reverting the conflicted change. Overwrite means to adopt the server copy's change, while Revert means to adopt the local's change.
Conflicts when updating |
|
||||||||||||||||||||||||||||||||||||||||||
The description of Update window when have conflicts |
Reminder of updating
When your teammates have committed their work to server, you will see a notification appear at the bottom right of Visual Paradigm window, reminding you to perform an update to obtain the changes. By clicking Update, the latest changes will be updated from server to your project. The effect is like performing a manual update but without the need to go through the menus/toolbars.
Update notification |
2. Commit | Table of Contents | 4. Branching |