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?
+1
A:
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-commit equals merge)
Remember that to merge a branch 'B' to master, 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.
VonC
2010-05-09 00:07:51
You are right, I formulated my question wrong. I'm calling "merge into master" from my alternative branch checkout.After a while it occurred to me that it was merging after all but the UI just doesn't seem to indicate it.Once I committed and pushed the master branch to the server it was clear that it had been merged all along.Thanks for your help:)
Marijn Huizendveld
2010-05-10 10:24:28