git pull的时候发生冲突的解决方法之“error: Your local changes to the following files would be overwritten by merge”

方法一、stash

1 git stash
2 git commit
3 git stash pop

方法二、放弃本地修改，直接覆盖

1 git reset --hard
2 git pull