beckhoff TE1000 TwinCAT 3 Multiuser — 4.3 Working with set functionality

Workflow Checks are carried out to ascertain whether there is a conflict with the data in the target repository. This is the case if other programmers working on the project have already made changes to the same project parts (e.g. POUs, settings etc.) and transferred them to the target repository. If there is a conflict, it is displayed in the following dialog. In this selection dialog you then have the option to resolve the conflicts using the TwinCAT Project Compare Tool, force an update of the target system including the target repository, or cancel the Activate, Download or Login.

The Force Update button can be used if the target system is required to run with the current project without taking into account the changes made by the other programmers involved in the project. There is no synchronisation with the multiuser repository. Once the project is running, the synchronisation with the multiuser repository must be done manually at a later time (see Manual tab [ } 25] ). The normal workflow for collaborating on a project involves resolving conflicts. In this step, you can merge the changes you have made to the project with those of the other programmers working on the project. 1. To do this, click Solve Conflict . р The Conflict tab now opens.

This allows you to discard all your local changes and apply the version from the target repository, or to merge the two versions. 2. To merge the versions, click Merge Local and Remote . TE1000 16 Version: 1.7.1