相关疑难解决方法(0)

我克隆了一个来自git的回购.然后删除.git和.gitignore.podFile看起来像

platform :ios, '6.1'

pod 'AFNetworking', '~>1.3.3'
pod 'AFOAuth1Client'

"pod install"后,我收到以下错误:

$ pod install
Analyzing dependencies
[!] Pod::Executable pull

A   ALPValidator/0.0.1/ALPValidator.podspec

A   APAsyncDictionary/0.0.3/APAsyncDictionary.podspec

A   ASCScreenBrightnessDetector/0.1.0/ASCScreenBrightnessDetector.podspec

A   AdBrixSDK/3.0.8/AdBrixSDK.podspec

A   AlertShortkut/1.0/AlertShortkut.podspec

A   AppStoreOpener/0.0.1/AppStoreOpener.podspec

A   Appboy-iOS-SDK/2.3.1/Appboy-iOS-SDK.podspec

A   Apptimize/1.5.8/Apptimize.podspec

A   AtkDragAndDrop/0.1.0/AtkDragAndDrop.podspec

A   AuthorizeNet/0.1.0/AuthorizeNet.podspec

A   BloodMagic/0.5.2/BloodMagic.podspec

A   CKStringUtils/1.1.1/CKStringUtils.podspec

A   CMHTMLView/0.2.0/CMHTMLView.podspec

A   CTAssetsPickerController/1.5.0/CTAssetsPickerController.podspec

A   CTFeedback/1.0.8/CTFeedback.podspec

U   CardIO/3.2.0/CardIO.podspec

U   CardIO/3.2.2/CardIO.podspec

U   CardIO/3.3.0/CardIO.podspec

U   CardIO/3.4.1/CardIO.podspec

U   CardIO/3.4.3/CardIO.podspec

U   CardIO/3.4.4/CardIO.podspec

A   CargoBay/2.0.2/CargoBay.podspec

U   CocoaSPDY/1.0.0/CocoaSPDY.podspec

A   Colours/4.1/Colours.podspec

M   CorePlot/1.0/CorePlot.podspec

M   CorePlot/1.1/CorePlot.podspec

M   CorePlot/1.2/CorePlot.podspec

M   CorePlot/1.3/CorePlot.podspec

M   CorePlot/1.4/CorePlot.podspec

M   DB5/0.0.1/DB5.podspec

A …

在我运行$sudo gem install cocoapods之后$pod setup,然后出现错误.请帮我修理一下.

[!] Pod::Executable pull

Updating eaf98af..ba3c030
error: Your local changes to the following files would be overwritten by merge:

    Google-Maps-iOS-SDK/1.3.0/Google-Maps-iOS-SDK.podspec

Please, commit your changes or stash them before you can merge.

Aborting