iOS开发中解决报错之The file .DS_Store had a tree conflict.

最近在pull代码的时候Xcode报错提示:The file .DS_Store had a tree conflict.


iOS开发中解决报错之The file .DS_Store had a tree conflict._第1张图片

我的做法是将该项目目录cd到终端中,然后在终端中输入命令git clean -d -fx即可。、

本篇文章到这里就结束了,愿大家加班不多工资多,男同胞都有女朋友,女同胞都有男朋友。

你可能感兴趣的:(iOS开发中解决报错之The file .DS_Store had a tree conflict.)