Merging TwinCAT PLC projects

If more than one developer is working on the same PLC project, conflicts may arise when "checking in/committing" the changes. For example, parallel POUs can be added/edited by more than one developer of the PLC project. These conflicts must be solved if a consistent project is to be created. This procedure for combining changes is called merging.

Notice

Loss of data

The "automerge" function (automatic merging) of Source Control Clients can lead to the loss of PLC objects (POUs, GVL, etc.).

Deactivate automatic merging of Source Control Clients
TwinCAT Project Compare Tool must be configured as Merge Tool. See Configuration of the TcProjectCompare for use with source control.

In case of conflicts when checking in the PLC project, the following dialog appears in the TSF Client:

Solve these problems as follows:

1. Select the option Merge Changes In Merge Tool.

2. After merging a PLC project (file extension *.PLCproj), request all files that were added to the PLC project with get latest version.