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
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.
master
origin/master