# Do this almost always - don't `git merge`
 git pull --rebase

 # but, do this if it ^ is bollocksed...
 git checkout -b master-copy && git checkout master && git reset --hard origin/master

 # now figure out what needs to go into branch master