When you play a lot with branches and kind of keep track of what should or shouldn't be merged between them, there's kind of a magical set of commands to force-overwrite your code with a specific branch:
git fetch --all git reset --hard origin/master
Make sure you have commited all your changes to some branch before you do it :-)
