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
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.