Git:Your local changes would be overwritten by merge.

1、在拉取项目的时候IDEA报错

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

 

2、解决方案

(1)隐藏掉自己的修改

(2)拉取项目

(3)取出修改的内容

 

posted @ 2021-02-10 17:50  怀梦想,致远方  阅读(889)  评论(0编辑  收藏  举报