Menu
I must be missing something very simple here. I never had a problem merging branches into master on earlier versions of Xcode, but I don't have the option on any projects while using Xcode 11.
How should I merge into master? Thanks.
569
Once the feature is complete, the branch can be merged back into the main code branch. First we run git checkout master to change the active branch back to the master branch. Then we run the command git merge new-branch to merge the new feature into the master branch.
To use Xcode to merge the current branch into another branch (for example, the develop branch into the master branch), go to Source Control > Your project name and branch > Merge into Branch.... Then just select the branch that you want to merge it into. You can view the changes and then make the merge.
To merge branches locally, use git checkout to switch to the branch you want to merge into. This branch is typically the main branch. Next, use git merge and specify the name of the other branch to bring into this branch. This example merges the jeff/feature1 branch into the main branch.
This is a frustrating Xcode 11 issue.
As a workaround you can checkout master first and then merge the required branch into it.
77
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
