After branching, making changes, and receiving approval for merging those changes through code review, the last step is to merge your development branch back into the main branch.
If you are merging a filetype that is supported by the Advanced Merge Tool (such as Siemens Step7 TIA Portal), you will need to use the Web App to perform these operations. The Desktop App does not currently support these advanced workflows.
To merge your development branch back into
main, click into the Current Branch dropdown, select the
mainbranch, and click on the Choose a Branch to Merge into main button.
Select your development branch and press the Merge button. If you do not have any merge conflicts, the merge will perform as expected.
While you can always directly merge your changes back into the main branch, Copia recommends that you get into the habit of always creating a PR.
If you attempt to merge a branch and someone else has already modified the file(s) within the
mainbranch, you'll get the following warning:
You'll want to select your local version (the option NOT prefixed with
origin/) and merge the files in. This will create a new commit. You can then navigate to the History tab to understand what you changed. We recommend you create another commit with the changes from remote that you overrode before pushing.