If I\'m working on a branch and then realize I need to merge another branch into mine here is my current workflow (for this example lets say that I\'m working on my-branch and w
Try this:
git pull yourRepositoryName master
I found an incantation that worked for me:
git fetch origin master:master
then (if you want to merge right away):
git merge master
I was really surprised how hard it was to find an answer to this since it seems like it would be a common use case.
You could also try this:
git fetch
git merge origin/master
This won't update your local master
pointer, but it will merge the latest origin/master
into your current local branch.
How'bout this :
$ git pull origin my-branch