search

ashfurrow / C-41

C-41 is an application to help people develop film at home by providing a series of "recipes" for photographers to use.
MIT License
2.05k stars 368 forks source link

pod install fails #11

Closed paulyoung closed 10 years ago

paulyoung commented 10 years ago

I'm using CocoaPods version 0.29.0.

Pauls-MacBook-Pro:git Paul$ git clone git@github.com:AshFurrow/C-41.git
Cloning into 'C-41'...
remote: Reusing existing pack: 585, done.
remote: Counting objects: 41, done.
remote: Compressing objects: 100% (34/34), done.
remote: Total 626 (delta 18), reused 30 (delta 7)
Receiving objects: 100% (626/626), 21.14 MiB | 1.90 MiB/s, done.
Resolving deltas: 100% (350/350), done.
Checking connectivity... done
Pauls-MacBook-Pro:git Paul$ cd C-41/
Pauls-MacBook-Pro:C-41 Paul$ pod install
Analyzing dependencies
[!] Pod::Executable pull

Updating b5b741a..5760c6a
error: Your local changes to the following files would be overwritten by merge:

    LibComponentLogging-pods/0.0.1/LibComponentLogging-pods.podspec

    PLDatabase/2.0-alpha/PLDatabase.podspec

    cocos2d/2.1/cocos2d.podspec

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

Aborting

Pauls-MacBook-Pro:C-41 Paul$ git status
# On branch master
nothing to commit, working directory clean
paulyoung commented 10 years ago

It turns out that CocoaPods/CocoaPods#776 was the culprit here.

paulyoung commented 10 years ago

It's working now, I'm curious though as to why the workspace isn't committed to the repo.

ashfurrow commented 10 years ago

Great point. I'll commit when I get home.

Ash Furrow iOS Developer, Author http://ashfurrow.com

On Jan 4, 2014, at 3:56 PM, Paul Young notifications@github.com wrote:

It's working now, I'm curious though as to why the workspace isn't committed to the repo.

— Reply to this email directly or view it on GitHub.