git fetch upstream/master
git checkout master
git reset --hard upstream/master
git push origin master -f