Conflict tab

The Conflict tab shows whether there are any conflicts between the local status and the status in the target repository, or if a merge has been triggered. The following cases are possible:

Local and target repositories have the same status:

The local system contains changes that have not yet been transferred:

Changes were made on both the local and the remote system:

Click the Merge Local and Remote button to show a list of the changes. In the following view you will see all objects in which changes have been made on both sides (for example the POU Main in the following figure).

To merge the changes, click the Start Merge button. The TwinCAT Project Compare Tool opens, in which you can merge the objects. After a successful merge, please confirm the changes with Accept, both in the TwinCAT Project Compare tool and in the Multiuser Explorer.

The target repository contains changes that have not yet been implemented locally:

Click the Get Latest button to fetch the current status of the target repository. TwinCAT now informs you that files have changed in the background and asks whether you want to reload them. Confirm this question with OK.