{"id":389,"date":"2014-03-02T14:21:53","date_gmt":"2014-03-02T06:21:53","guid":{"rendered":"http:\/\/www.withonly.com\/?p=389"},"modified":"2014-03-02T14:21:53","modified_gmt":"2014-03-02T06:21:53","slug":"pull-is-not-possible-because-you-have-unmerged-files%e8%a7%a3%e5%86%b3%e6%96%b9%e6%b3%95","status":"publish","type":"post","link":"https:\/\/blog.5danyuan.com\/?p=389","title":{"rendered":"Pull is not possible because you have unmerged files\u89e3\u51b3\u65b9\u6cd5"},"content":{"rendered":"<p>\u6700\u8fd1\u5728\u9879\u76ee\u4e2d\u6dfb\u52a0\u4e86\u4e00\u4e2a\u00a0SDWebImage\u00a0\u5f00\u6e90\u7ec4\u4ef6\uff0c\u7136\u540e\u8fd0\u884c pod install\u7684\u65f6\u5019\uff0c\u7ed3\u679c\u51fa\u73b0\u4e86Pull is not possible because you have unmerged files\u00a0\u9519\u8bef\u63d0\u793a\u3002<\/p>\n<p>\u5220\u9664\u7136\u540e\u91cd\u65b0\u5b89\u88c5\uff0c\u4f9d\u7136\u62a5\u9519\u3002\u89e3\u51b3\u65b9\u6cd5\u5982\u4e0b\uff1a<\/p>\n<p>pod repo remove master<\/p>\n<p>pod setup<\/p>\n<p>\u5982\u679c\u4ecd\u7136\u6ca1\u6709\u6548\u679c\uff0c\u90a3\u4e48\u518d\u6e05\u7406\u4e0b\u7f13\u5b58<\/p>\n<p>rm -rf ~\/.coocapods\/<\/p>\n<p>pod setup<\/p>\n<p>\u6211\u8fd9\u8fb9\u53ea\u8fdb\u884c\u4e86\u4e0a\u9762\u7684\u7b2c\u4e00\u6b65\u5c31\u5df2\u7ecf\u6b63\u5e38\u4e86\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u6700\u8fd1\u5728\u9879\u76ee\u4e2d\u6dfb\u52a0\u4e86\u4e00\u4e2a\u00a0SDWebImage\u00a0\u5f00\u6e90\u7ec4\u4ef6\uff0c\u7136\u540e\u8fd0\u884c pod install\u7684\u65f6\u5019\uff0c\u7ed3\u679c\u51fa\u73b0\u4e86Pu [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[27,5],"tags":[160,159],"class_list":["post-389","post","type-post","status-publish","format-standard","hentry","category-ios","category-daily","tag-cocoapods","tag-159"],"_links":{"self":[{"href":"https:\/\/blog.5danyuan.com\/index.php?rest_route=\/wp\/v2\/posts\/389","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/blog.5danyuan.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.5danyuan.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.5danyuan.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.5danyuan.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=389"}],"version-history":[{"count":0,"href":"https:\/\/blog.5danyuan.com\/index.php?rest_route=\/wp\/v2\/posts\/389\/revisions"}],"wp:attachment":[{"href":"https:\/\/blog.5danyuan.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=389"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.5danyuan.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=389"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.5danyuan.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=389"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}