did you do `git reset --hard origin/master` ?
# knote
n
did you do
git reset --hard origin/master
?