git discard all local changes/commits and pull from upstream git reset --hard origin/master git pull origin master