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

How do I perform a manual TIA Portal project merge if I'm unable to use the Copia Advanced Merge Tool?

This article describes the steps to manually merge TIA Portal projects instead of Copia's Advanced Merge Tool.

If Copia's Advanced Merge Tool is failing to merge your projects (Why can this happen?), you may need to manually merge your projects instead. You can follow these general steps below to perform the manual merge. These steps bypass the Advanced Merge Tool workflow entirely.

  1. Use the Copia web app to download the newest version of your project from both the parent and sub-branch. We recommend adding the branch name and/or the commit SHA to the end of each file name to keep track of them. Temporarily store them outside of your repository folder, such as on your Desktop.
  2. Manually merge your projects
    1. Option 1: Copy/Paste method; fast and simple; best for merging projects with few differences
      1. Open both projects in TIA Portal. Copy/Paste changes as needed to the sub-branch project. You can use the non-sequential compare tool in the Copia desktop app to highlight the differences between the branches.
    2. Option 2: Reference Project method; more complex; best for merging complex projects with many differences
      1. Make use of the Reference Project comparison functionality it TIA Portal to do offline/offline comparison of the two projects. This workflow is covered in this Siemens article.
  3. Compile your manually-merged projects. Ensure that there are no compilation errors
  4. Save your project with the original file name
    1. It is critical that you use the same file name. Ensure that the project folder and the .apXX file has the same name as the original.
  5. In the Copia desktop app, navigate to your repo and the sub-branch (i.e. the branch that you are merging into the parent branch in the PR)
    1. Be sure to Fetch and Pull if there are any commits that need to be pulled locally
  6. Copy and Paste the manually-merged project that you have saved to the temporary location into the repo folder. This should replace the previous file(s) that are there.
    1. The Copia desktop app should detect the project and automatically Auto-Archive the project
  7. Commit and Push this manually-merged project
    1. Important: Since you've now manually merged the project outside of the Copia environment, it is best practice to leave a detailed commit message describing what you've done. An example is shown below
    2. Example Commit Message: "Manually merged projects from the master branch (commit SHA XXXXXX) and new-feature branch (commit SHA XXXXXX) in place of the Advanced Merge Tool"
    3. Example Commit Description: "I manually included the new <block names> from the new-feature branch into the master branch. I also manually added the new hardware device <device name>"
  8. Return to the Pull Request in the Copia Web app. Ensure that your most recent commit shows up at the bottom of the "Conversation" tab
  9. At the bottom of the bottom of the "Conversation" tab, leave a comment describing your manual merge, similar to the comments from Step 7
  10. In the "Conflicts" window, click the "Overwrite <branch_name> branch" option
    1. Do not click the "Open Advanced Merge Tool" button
  11. Close the Pull Request and optionally delete the sub-branch
  12. Return to the Copia desktop app, switch to the parent branch and perform a Fetch and Pull to get the newly-updated parent branch locally before making any future branches
  13. Delete any of the local projects that you used to avoid confusion in the future
You've now completed manually merging your TIA Portal projects.