I’m having trouble merging two branches with Gity. When I do a checkout on my alternative branch and click: “Merge into master” nothing seems to happen…
Any thoughts?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I’m having trouble merging two branches with Gity. When I do a checkout on my alternative branch and click: “Merge into master” nothing seems to happen…
Any thoughts?
If you click on master after having checked-out master, then the option “merge into master” won’t merge anything.
If not, according to the python source called by the XCode, it should mention any error message if the merge were to fail.
Since it does not mention anything, that means the merge doesn’t have to do anything (like when the
ancestor-commitequalsmerge)Remember that to merge a branch ‘
B‘ tomaster, you need to:git checkout master(which you did)git merge B(in other word, merge must be called with ‘B‘, not ‘master‘, for ‘B‘ to be merged to ‘master‘): if you are sureGTOpMerge.mdoes that when you are selecting ‘merge to master‘, then it is a bug.