git推送问题：The following untracked working tree files would be overwritten by merge: src/.DS_St

遇到的git推送问题

git pull origin daily/1.0.2

From http://gitlab.alibaba-inc.com/dawn/yunqi-ticket
 * branch            daily/1.0.2 -> FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
        src/.DS_Store
Please move or remove them before you merge.
Aborting

方案1：
git clean -d -fx “”
其中
x -----删除忽略文件已经对git来说不识别的文件
d -----删除未被添加到git的路径中的文件
f -----强制运行

git 解决pull origin 错误 error : https://blog.csdn.net/qing101hua/article/details/46312795