cocospods 报错 Pull is not possible because you have unmerged files

pod repo remove master

pod setup

解决该问题