error: Your local changes to the following files would be overwritten by merge:

git stash
git pull origin master
git stash pop

别问,自用

你可能感兴趣的:(服务器)