I\'m using Git on a new project that has two parallel -- but currently experimental -- development branches:
master
I had the exact same problem as mentioned by you above. But I found this Git blog clearer in explaining the answer.
Command from the above link:
# You are in the branch you want to merge to git checkout