git 问题:Your local changes to the following files would be overwritten by merge

git stash
git pull
git stash pop

猜你喜欢

转载自san-yun.iteye.com/blog/2192826