idea git pull遇到错误：error: Your local changes to the following files would be overwritten by merge

阳光穿透心脏的1/2处 2022-05-10 04:50 198阅读 0赞

1. IDEA 中git 文件颜色标识  
2. git pull遇到错误：error: Your local changes to the following files would be overwritten by merge.md

## 1. IDEA 中git 文件颜色标识 ##

![70][]  
绿色，已经加入控制暂未提交   
 ![70 1][]  
红色，未加入版本控制   
 ![70 2][]  
蓝色，加入，已提交，有改动   
 ![70 3][]  
白色，加入，已提交，无改动   
 ![70 4][]  
灰色：版本控制已忽略文件。

--------------------

## 2. git pull遇到错误：error: Your local changes to the following files would be overwritten by merge.md ##

![70 5][]  
参考：[git pull遇到错误：error: Your local changes to the following files would be overwritten by merge:][git pull_error_ Your local changes to the following files would be overwritten by merge]   
[https://blog.csdn.net/nan7\_/article/details/25624637][https_blog.csdn.net_nan7_article_details_25624637]   
如果你想保留刚才本地修改的代码，并把git服务器上的代码pull到本地（本地刚才修改的代码将会被暂时封存起来)

输入以下命令  
git stash   
git pull origin master   
git stash pop

然后diff一下文件，看看自动合并的情况，并作出需要的修改。   
git stash: 备份当前的工作区的内容，从最近的一次提交中读取相关内容，让工作区保证和上次提交的内容一致。同时，将当前的工作区内容保存到Git栈中。   
git stash pop: 从Git栈中读取最近一次保存的内容，恢复工作区的相关内容。由于可能存在多个Stash的内容，所以用栈来管理，pop会从最近的一个stash中读取内容并恢复。   
git stash list: 显示Git栈内的所有备份，可以利用这个列表来决定从那个地方恢复。   
git stash clear: 清空Git栈。此时使用gitg等图形化工具会发现，原来stash的哪些节点都消失了。

![20180525154213512][]

[70]: /images/20220510/c9b3717e1d8c40b0bfd6b9bb374b3302.png
[70 1]: /images/20220510/24fcf351947e4ea28bd25f7e4e6d7524.png
[70 2]: /images/20220510/7dd51e6a021049d0a929dbc18a11f759.png
[70 3]: /images/20220510/1ed0d56864304408bcc52541f269cc18.png
[70 4]: /images/20220510/94f4fbeca36e468388f53ca36a27c79c.png
[70 5]: /images/20220510/4207b92ad59f4cd7b75cad312fd5e213.png
[git pull_error_ Your local changes to the following files would be overwritten by merge]: https://blog.csdn.net/misakaqunianxiatian/article/details/51103734
[https_blog.csdn.net_nan7_article_details_25624637]: https://blog.csdn.net/nan7_/article/details/25624637
[20180525154213512]: /images/20220510/e96006f13d024e2188e4186176b9651e.png

idea git pull遇到错误：error: Your local changes to the following files would be overwritten by merge

发表评论取消回复

还没有评论，来说两句吧...

相关阅读

相关 error: Your local changes to the following files would be overwritten by merge

相关【Git】pull时发生冲突，提示：error: Your local changes to the following files would be overwritten by merge:

相关 error: Your local changes to the following files would be overwritten by merge

相关 git pull错误：Your local changes to the following files would be overwritten by merge

相关 github desktop出现error: Your local changes to the following files would be overwritten by merge:

相关 error Your local changes to the following files would be overwritten by merge

相关 git:error: Your local changes to the following files would be overwritten by checkout:

相关 idea git pull遇到错误：error: Your local changes to the following files would be overwritten by merge

相关 git提示error: Your local changes to the following files would be overwritten by merge:

相关 git pull 提示错误,Your local changes to the following files would be overwritten by merge