Uploading local changes to the team server

1. Make the Team-Monitor view visible to see the team status. Best practice is to move the view into e.g. the editor area so that the entire content will be visible.

2. Select the imported team project under Select project.

3. Recommended: Update the local status of your project by downloading the most current status from the team server: open the context menu for the list under Changed on master and select the command Download changes from server.

4. If you want to modify or delete the existing objects, continue with step 5 at once.
   If you require a new object within the project: Create the new object within the project. Subsequently, the object is listed within the Team Monitor view, in particular the list under Resource. Continue with step 5.

5. If logi.CAD 3 has not locked the appropriate objects yet (see " Specifics of locked objects " for details): Lock the appropriate objects as follows: Open the context menu for one or several objects within the project explorer and select the command Lock selected files.
   Result: The objects are listed within the Team Monitor view, in particular in the list under Locked by me.

6. If you want to modify existing objects: Open the objects to modify them. Tip: Double-click an object displayed within the Team Monitor view, in particular the list under Locked by me. Afterwards modify the object and save the changed object (as usual).
   If you want to delete existing objects: Delete the object within the project explorer (as usual).
   Result: The objects are listed within the Team Monitor view, in particular the list under Resource. The column Kind indicates whether the object has been changed, created or deleted.

7. Upload your local changes to the team server: Select the appropriate object or objects within the Team Monitor view, in particular the list under Resources. Open the context menu and select the command Upload changes to server. In the dialog, enter a meaningful comment and click OK.
   Result: The objects are not listed under Resource any longer because the changes have been uploaded. The locks are automatically removed.

8. If you want to wrap up your work for the objects, release the locks of the objects: Open the context menu for one or several objects within the project explorer and select the command Unlock selected files. – Other team members will be able to lock the objects themselves.
   If you want to continue your work for the objects, start with step 6 of this instruction. Of course, it is possible to create new objects within the project and lock them as well (as described within this instruction).

9. Recommended: Update the local status of your project – see step 3.

Discarding local changes to restore the status on the team server

It is possible that you do not want to upload your local changes to the team server (see step 7 of the previous instructions) but that you want to restore the status of the object as provided on the team server. In this case, proceed as follows for an already locked object:

Select the appropriate object or objects within the Team Monitor view, in particular the list under Resources. Open the context menu and select the command Discard changes. Click Yes when the prompt appears.
Result: The objects are not listed under Resource any longer because there are no local changes any longer. But they are still listed under Locked by me – as long as you do not unlock the objects.

Refreshing the view of objects

How to refresh the view of →resources within the Team Monitor view:

From the context menu of the corrsponding elements (e.g. the list under Locked by others), select Refresh.

Resolving conflicts

Conflicts may arise if different team members independently edit an object in the Team-Monitor view. As a result, a more recent version of the object may be available on the server, or the object may have been deleted from the server in the meantime. Such conflicts arise in particular if a user edits an object without locking it. In the views with projects and resources, a symbol for an object highlights that a newer version is available on the server.
Example: The icon indicates that a newer version is available on the server for an ST-object. The ST-object can be identified by the icon .

To take over the server version of an object despite a conflict, carry out the following steps:

1. In the Team-Monitor view, select the command Download changes from server for the respective object.

   logi.CAD 3 creates a backup file with the prefix _BACKUP. While the backup file contains the status of the local object, the file without prefix contains the status from the server.
   Example: The backup file __BACKUP.MyMotor.iecfbd contains the local changes while the FBD-object MyMotor contains the state from the server.

2. To take over your local modifications now contained in the backup file, the best practise is to compare the two files with the help of the command Compare With and Each Other, and implement your local modifications into the server version.

3. Once you have carried out all steps to resolve the conflict, delete the backup file.

Specifics of locked objects

Locked objects have the following specifics:

• If you create an object, logi.CAD 3 automatically locks this object.
  Prior to creating the object, logi.CAD 3 checks whether a lock is available from another user. If this is the case, a message informs you that you cannot create the object.

• Starting in the Team-Monitor view: If you open an existing object, logi.CAD 3 automatically locks this object. If logi.CAD 3 cannot lock the object, the editor is opened in read-only mode.
  Prior to opening the object, logi.CAD 3 also checks whether a lock is available from another user. If this is the case, the object is opened in read-only mode as well. Reason: You cannot edit objects that have been locked by another user.

• If you delete an object, logi.CAD 3 automatically locks this object. Exception: You cannot delete objects that have been locked by another user.

Additional information: logi.CAD 3 regularly checks the status of the objects. If you have opened an editor for an object and this object has been locked by another user in the meantime, your editor switches to the read-only mode. Details: See "Behavior of locked objects in the Team Monitor view".