Why can I only select one branch from Siemens TIA Portal Advanced Merge Tool conflict resolution?
Certain types of blocks are unable to be exported, so Copia chooses the sub-branch version of the TIA Portal project as the "base" of the merged project.
If you're using the Advanced Merge Tool for TIA Portal projects, you may notice certain project items that are marked as Conflicted, but when you go to resolve them you don't have the option to select the base branch as the version to use to resolve the conflict, as seen below.
As the message in the screenshot describes, the sub-branch is used as the "base project" when performing the merge. This only impacts project items that can't be exported by the Openness API, which typically are project items that you as the user don't have the ability to change anyway. We still display these items as conflicts in the interest of being transparent that these items technically may have been modified since we have no way of knowing if they have or not. There is no issue in selecting the only available branch in almost all cases.
Elements of the UI may have changed since the time of posting. For the most up-to-date information, refer to our Documentation.