Cocoapods error: “Pull is not possible because you have unmerged files.”

今天工程全部迁移到了cocoapods

执行pod install时是提示

Pull is not possible because you have unmerged files

可是git status 发现本地并没有需要提交的文件, 于是猜想问题出在了 cocospod上面 

果然在Stack Overflow 有人发生了与我相同的错误

好在已经有了解决方法

  $ pod repo remove master
  $ pod setup

rm -rf ~/.cocoapods/

然后执行 pod install 即可

参考

http://stackoverflow.com/questions/21534309/cocoapods-error-pull-is-not-possible-because-you-have-unmerged-files

https://github.com/CocoaPods/Specs/issues/1268  

Cocoapods error: “Pull is not possible because you have unmerged files.”

原文：http://blog.csdn.net/hufengvip/article/details/19628401