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