error: The following untracked working tree files would be overwritten by merge:

git pull 时遇到以下错误:

error: The following untracked working tree files would be overwritten by merge:  OA/OA/.DS_Store

解决方法:

git clean -d -fx "OA/OA/.DS_Store"

其中

x -----删除忽略文件已经对git来说不识别的文件

d -----删除未被添加到git的路径中的文件

f -----强制运行

你可能感兴趣的:(error: The following untracked working tree files would be overwritten by merge:)