场景
使用 git pull 命令更新报错
Updating d652d1c..fa05549 error: The following untracked working tree files would be overwritten by merge:.idea/encodings.xml
Please move or remove them before you can merge. Aborting
解决
使用 git clean -d -fx 命令即可。
使用 git pull 命令更新报错
Updating d652d1c..fa05549 error: The following untracked working tree files would be overwritten by merge:.idea/encodings.xml
Please move or remove them before you can merge. Aborting
使用 git clean -d -fx 命令即可。