error: Your local changes to the following files would be overwritten by merge:
解决方案:
git stash
git pull origin master
git stash pop

error: Your local changes to the following files would be overwritten by merge:
解决方案:
git stash
git pull origin master
git stash pop