pod repo remove master
pod setup
解决该问题
cocospods 报错 Pull is not possible because you have unmerged files,布布扣,bubuko.com
cocospods 报错 Pull is not possible because you have unmerged files
原文：http://www.cnblogs.com/binglin92/p/3598672.html
