webstorm git pull冲突:Your local changes would be overwritten by merge

责编:menVScode 2018-11-15 15:25 阅读(103)

当同一个文件有多个人修改的时候,若你 git pull 代码就会出现报错信息:

Git Pull Failed
Your local changes would be overwritten by merge.
Commit, stash or revert them to proceed. View them


按以下命令就能解决冲突并成功提交代码

git pull
git stash
git pull
git stash pop
git status
git add .
git commit -m '冲突'
git push
标签: webstorm git pull
前端交流群: MVC前端网(menvscode.com)-qq交流群:551903636

邮箱快速注册

忘记密码