Your local changes would be overwritten by merge. Commit, stash or revert them to proceed的解決方法

git stash
git pull origin master
git stash pop      

git reset --hard
git pull origin master  （其中origin master表示git的主分支）