Skip to content
English
More support Sign in
Contact us
  • There are no suggestions because the search field is empty.

What is the Advanced Merge tool?

Advanced Merge is available in the web app to resolve a conflict during the merging of one branch into another.

If two people worked in the same project after the branch was created, a conflict will occur.

When a Pull Request has been made and it is ready to be merged, you will notice in the web app that there is a conflict and that the Advanced Merge tool option will appear. You can either overwrite the target branch, or take advantage of Advanced Merge. Select Open Merge Tool to continue.

Advanced Merge will list the conflicted items on the left side of the screen, in a manner similar to the programming software. You can click into each item in the project tree to review changes. The number of conflicts are listed at the top of the merge tool. Once all conflicts have been resolved, the Advanced Merge tool will attempt to generate a new PLC project file with the selections that you've made.

Currently, the Advanced Merge tool is only offered for Rockwell RSLogix 5000 v20, Rockwell Studio 5000 v28-v34, and Siemens TIA Portal v14.1 sp1 - v18. Specific information about the Rockwell Advanced Merge tool can be found in our Documentation. Information regarding the Siemens Advanced Merge tool can also be found in our Documentation. 

 

Elements of the UI may have changed since the time of posting. For the most up-to-date information, refer to our Documentation.