-
-
Save kkodev/60c2225ae3016546c33659e318408b05 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updating spec repo `master` | |
$ /usr/bin/git pull --ff-only | |
error: Your local changes to the following files would be overwritten by merge: | |
CocoaPods-version.yml | |
Specs/AGIPC/0.0.2/AGIPC.podspec.json | |
Specs/AlamofireImage/2.3.1/AlamofireImage.podspec.json | |
Specs/AudioPlayer-Swift/1.0/AudioPlayer-Swift.podspec.json | |
Specs/Curio_iOS_SDK/1.2.5/Curio_iOS_SDK.podspec.json | |
Specs/DemoWatch1/8.0.18/DemoWatch1.podspec.json | |
Specs/GoogleMapDirections/1.0/GoogleMapDirections.podspec.json | |
Specs/React/0.1.0/React.podspec.json | |
Specs/React/0.10.0-rc/React.podspec.json | |
Specs/React/0.10.0/React.podspec.json | |
Specs/React/0.11.0-rc/React.podspec.json | |
Specs/React/0.11.0/React.podspec.json | |
Specs/React/0.12.0-rc/React.podspec.json | |
Specs/React/0.2.0/React.podspec.json | |
Specs/React/0.2.1/React.podspec.json | |
Specs/React/0.3.0/React.podspec.json | |
Specs/React/0.3.1/React.podspec.json | |
Specs/React/0.3.11/React.podspec.json | |
Specs/React/0.3.2/React.podspec.json | |
Specs/React/0.3.3/React.podspec.json | |
Specs/React/0.3.4/React.podspec.json | |
Specs/React/0.3.8/React.podspec.json | |
Specs/React/0.4.0/React.podspec.json | |
Specs/React/0.4.1/React.podspec.json | |
Specs/React/0.4.2/React.podspec.json | |
Specs/React/0.4.3/React.podspec.json | |
Specs/React/0.4.4/React.podspec.json | |
Specs/React/0.5.0/React.podspec.json | |
Specs/React/0.6.0-rc/React.podspec.json | |
Specs/React/0.6.0/React.podspec.json | |
Specs/React/0.7.0-rc.2/React.podspec.json | |
Specs/React/0.7.1/React.podspec.json | |
Specs/React/0.8.0-rc/React.podspec.json | |
Specs/React/0.8.0/React.podspec.json | |
Specs/React/0.9.0-rc/React.podspec.json | |
Specs/React/0.9.0/React.podspec.json | |
Specs/SOAPEngine/1.21.2/SOAPEngine.podspec.json | |
Specs/SOAPEngine/1.24/SOAPEngine.podspec.json | |
Specs/SOAPEngine/1.25.1/SOAPEngine.podspec.json | |
Specs/SZCircleView/0.0.1/SZCircleView.podspec.json | |
Specs/SZCircleView/0.0.2/SZCircleView.podspec.json | |
Specs/SZCircleView/0.0.3/SZCircleView.podspec.json | |
Specs/SZFrameHelper/0.0.1/SZFrameHelper.podspec.json | |
Specs/SZQRCodeCoverView/0.0.1/SZQRCodeCoverView.podspec.json | |
Specs/SZQRCodeCoverView/0.0.2/SZQRCodeCoverView.podspec.json | |
Specs/SZTabSwitchBar/0.0.1/SZTabSwitchBar.podspec.json | |
Specs/SZTabSwitchBar/0.0.2/SZTabSwitchBar.podspec.json | |
Specs/SZTabSwitchBar/0.0.3/SZTabSwitchBar.podspec.json | |
Specs/Tesseract-wrapper/0.0.2 | |
Specs/TestGhostPlus/1.05/TestGhostPlus.podspec.json | |
Specs/TestGhostPlus/1.21/TestGhostPlus.podspec.json | |
Specs/TestGhostPlus/1.22/TestGhostPlus.podspec.json | |
Specs/ably/0.7.0/ably.podspec.json | |
Specs/cheniu_upload/0.3.9/cheniu_upload.podspec.json | |
Please, commit your changes or stash them before you can merge. | |
Aborting | |
Updating 09a5976..f3d2c9e |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment