git pull冲突

拉取时报错
error: The following untracked working tree files would be overwritten by merge:
.DS_Store
xxx/.DS_Store
xxx/Category/.DS_Store
Please move or remove them before you merge.

解决方案
cd到相应文件夹
git clean -d -fx ".DS_Store"
git clean -d -fx "xxx/.DS_Store"
git clean -d -fx "xxx/Category/.DS_Store"
然后解决冲突后即可