今天一打开项目就git pull失败了,很是苦恼
11:20 Git Pull Failed
Your local changes would be overwritten by merge.
Commit, stash or revert them to proceed. View them
pull失败后重新解决 首先在idea中右键 点击 git -revert 还原
然后重新拉取,发现分支有冲突,于是依次点击idea中红色部分
然后重新git pull下 出现All files are up-to-data了好了]
[注意:前面两步骤 都需要git pull的支持,别忘记]