git error: Your local changes to the following files would be overwritten by merge:xxxxxx ,Please co

时间 2019-11-06

标签 git error local changes following files overwritten merge 栏目 Git 繁體版

原文原文链接

git报错php

error: Your local changes to the following files would be overwritten by merge:
.idea/encodings.xml
Please commit your changes or stash them before you merge.
Aborting

解决办法

phpstorm的操做html

1.在整个项目上右键-【git】-【Repository】-【Stash Changes】而后按照默认设置直接点击【Create Stash】git

2.在直接进行pull操做phpstorm

在整个项目上右键-【git】-【Repository】-【Pull】ide

参考资料工具

Git 工具 - 储藏（Stashing）idea