Merging
Merging
After Branching and making changes, and optionally getting approval for merging those changes during a Code Review, it is time to merge the branch back into the main branch.
If you are merging a filetype that is supported by Advanced Merging (such as Rockwell Logix Designer or Siemens Step7 TIA Portal), please use the Web app to perform these operations. The desktop app does not support these advanced workflows at this time.
Standard Workflow (desktop)
At this stage, we recommend that you create a pull request, but you can also directly merge your changes back into the main branch by selecting the main branch and then select Choose a branch to merge into master.
To finish the merge, select your branch and press Merge. If you get a merge conflict on this step, you can reference the merge conflicts section.
Merge Conflicts
Sometimes when you attempt to merge a file it'll turn out someone else has already modified that file. You'll get the following warning.
Once you select the name of your branch (in the step above, the branch name is
merge-conflict and the selection is Use modified file from merge-conflict), you can merge your changes into the main branch. This will override whatever change is on the main branch, so make sure that you've first included any changes that you want to merge from master and committed them on your local branch before merging.It might make sense to create a pull request and compare changes before merging.
You've been branching and merging all along...
Finally, some readers who have been following the "pulling and pushing" workflow from the previous section might have noticed that sometimes when they pull a change from a remote repository, they see another commit that says something about "merging" the remote change into main. The Copia Desktop app does this automatically, but it's the same basic merge flow that we describe above.
Last modified 3mo ago