git checkout master
git reset --hard upstream/master
git pull --rebase upstream/master
git push origin master --force