今天使用git pull时候出现这个提示。

Your local changes would be overwritten by merge. 

Commit, stash or revert them to proceed. 

如果Pull 会把我修改的代码覆盖。

解决方案

第一步: stash changes 储存我自己的修改

Your local changes would be overwritten by merge. Commit, stash or revert them to proceed._git

你操作完了,发现项目是修改前的了。

第二步:Pull

把远程仓库的代码拉下来

Your local changes would be overwritten by merge. Commit, stash or revert them to proceed._远程仓库_02

第三步:unstash changes 取出我们的修改,merge合并,commit&push提交

Your local changes would be overwritten by merge. Commit, stash or revert them to proceed._解决方案_03