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

Performing a Manual Merge during a Pull Request

If an automatic merge during a Pull Request is not possible, this describes a process to manually merge projects

When a Pull Request contains a conflict—often caused by multiple people working on the same project file—you may have the option to use an automatic merge tool or overwrite the target branch. We generally recommend using the merge tool whenever possible. However, if an automatic merge isn’t feasible, the following process outlines how to manually merge your project. This approach still supports a full Code Review and Approval before merging the project back into the target branch.

Using the Copia Desktop App take the steps below (this example uses the names main and branch, with branch merging into main):

  1. Assuming you already have a Pull Request (PR) created, and have a conflict that cannot be resolved by one of the Copia Advanced Merge Tools;
  2. In the Copia desktop app, clone the repo, and switch to Main, using the Desktop App branch menu
    1. If you already have the repo cloned and are on main you can skip this step
  3. Copy (not move) the project (file or folder) on Main from the Repo to the Desktop
  4. Switch to Branch using the Desktop App branch menu
  5. Open the project in the Repo
  6. If the vendor provides a merge tool, you can use this now to merge changes from the desktop project into the repo project, and then jump to #9
  7. If there is no vendor provided merge tool, open the project on the desktop (from #2) in another instance of the IDE
    1. If using Siemens TIA Portal, you can open this as a reference project
  8. Merge your changes manually into the Repo project
  9. When done, save the project in the repo (i.e. on the branch)
  10. Commit and push your changes
  11. Return to PR and perform Code Review and Approval (if applicable)
  12. When ready, use Overwrite Main Branch