Cocoapods错误：“拉不可能，因为你有未合并的文件。”(Cocoapods error: “Pull is not possible because you have unmerged file

Cocoapods错误：“拉不可能，因为你有未合并的文件。”(Cocoapods error: “Pull is not possible because you have unmerged files.”)

当安装一个新的CocoaPod时，我得到了以下错误。

$ pod install Analyzing dependencies [!] Pod::Executable pull A AFHARchiver/0.2.1/AFHARchiver.podspec A AFWunderlist/1.0/AFWunderlist.podspec A AFWunderlist/1.1/AFWunderlist.podspec A AFgzipRequestSerializer/0.0.1/AFgzipRequestSerializer.podspec

。 。 。

A wpxmlrpc/0.4/wpxmlrpc.podspec A zipzap/6.0/zipzap.podspec Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use `'git add/rm <file>'` as appropriate to mark resolution, or use `'git commit -a'`.

以为我会分享下面的修复。

When installing a new CocoaPod, I got the following error.

$ pod install Analyzing dependencies [!] Pod::Executable pull A AFHARchiver/0.2.1/AFHARchiver.podspec A AFWunderlist/1.0/AFWunderlist.podspec A AFWunderlist/1.1/AFWunderlist.podspec A AFgzipRequestSerializer/0.0.1/AFgzipRequestSerializer.podspec

. . .

A wpxmlrpc/0.4/wpxmlrpc.podspec A zipzap/6.0/zipzap.podspec Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use `'git add/rm <file>'` as appropriate to mark resolution, or use `'git commit -a'`.

Thought I would share the fix below.

最满意答案

问题出在规格库上，而不是在我身上。

在这里找到答案podfile在安装时给出了一个错误 ，但由于问题对症状的描述不太明确，所以我想我会再次交叉引用它，以防有人以不同的方式查找它。

答案在这里的博客文章http://blog.cocoapods.org/Repairing-Our-Broken-Specs-Repository/中解释了这个问题和下面重复的修复：

“您将不得不手动删除Specs存储库的任何本地副本，并重新克隆规格存储库的新版本。您可以使用以下命令执行此操作：

$ pod repo remove master $ pod setup

如果您有任何本地提交或对未合并的规格库的更改，则应确保您拥有它们的副本。 我建议您手动复制这些更改并重新提交它们。 您可以在不删除的情况下修复您的存储库，但这不是一个简单的过程，所以我们建议您删除您的规格存储库副本及其任何分支。“

Problem was with specs repository, not on my side.

Found the answer here podfile gives an error on install, but since the question was less explicit on the symptom, I thought I would cross-reference it again in case someone was looking it up differently.

The answer is in the blog post here http://blog.cocoapods.org/Repairing-Our-Broken-Specs-Repository/ which explains the issue and the fix which is repeated below:

"You are going to have to manually delete any local copies of the Specs repository and re-clone the new version of the Specs repository. You can do that with the following commands:

$ pod repo remove master $ pod setup

If you have any local commits or changes to the Specs repository which are not merged, you should ensure you have a copy of them. I would recommend that you manually copy these changes over and re-commit them. You can fix your repository without deleting, however, this is not a simple process, so we are instead recommending that you delete your copy of the Specs repository and any forks of it."