Cocoapods错误：“因为您有未合并的文件，因此无法进行拉取。” [英] Cocoapods error: "Pull is not possible because you have unmerged files."

问题描述

安装新的CocoaPod时，我收到以下错误。

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.

推荐答案

问题在于specs存储库，而不在我身边。

Problem was with specs repository, not on my side.

在这里找到答案 podfile安装错误，但由于症状不明确，我想我会再次交叉引用它以防有人以不同的方式查找它。

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.

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

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:

你要去了必须手动删除Specs存储库的任何本地副本并重新克隆新版本的Specs存储库。您可以使用以下命令执行此操作：

"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

如果你你有没有合并的Specs存储库的任何本地提交或更改应该确保你有一份副本。我建议您手动复制这些更改并重新提交它们。您可以修复您的存储库而不删除，但是，这不是一个简单的过程，因此我们建议您删除Specs存储库的副本及其任何分支。

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."

这篇关于Cocoapods错误：“因为您有未合并的文件，因此无法进行拉取。”的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！