git pull origin develop报错Your local changes to the following files would be overwritten by merge:
更新远程代码到本地 提示Your local changes to the following files would be overwritten by merge问题解决:要保存本地修改git stash的时候会把你本地快照 git stash git pull 更新这时你会看到你的修改被覆盖了git pull origin 分支这时候执行git stash pop你去本地看会发现发生冲突的本地修改还在,再执行commit pushgit stash pop如果不保存本地修改