Here is what i did and got error.
I wanted to use grabkit : https://github.com/pierrotsmnrd/grabKit
Before using it in my project, i updated my ruby to 2.0.0p247 and cocoapods to 0.29.
and then whenever i m going to any of my projects and try to do pod install. It gives me error saying --
"Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm '
as appropriate to mark resolution, or use 'git commit -a'"
Prior to this i was working on a repo, which i cloned, made some changes and committed.
After getting this error, i deleted that repo from my computer. and listed down all the git repos and i am 100% sure that i haven't touched any other git repo on my computer(in terms of making any changes)
Related
I am using GitHub to share my project with others. It was setup and working great. Then I just did a pod update and pushed with the update. Now when the project is pulled from the git it seems to be missing pod related files.
In other words, the program builds fine on computer that pushed the update. However when it's cloned error message like pop up:
error: <directory location>/Pods/Target Support
Files/BoringSSL-GRPC/BoringSSL-GRPC.xcconfig: unable to open file (in
target "BoringSSL-GRPC" in project "Pods") (in target
'BoringSSL-GRPC')
I tried doing a commit and pushing from terminal but the problem persists. Then I tried creating a new git but when I push to it all the old commits are still there and the problem persists. It feels like a fresh clean commit starting from nothing might fix the issue, but I haven't been able to figure out how to do something like that.
Check your commit changes after pod updated.
Follow these steps:
1/ Pod update and push this commit to GitHub
2/ Go to GitHub, click "commits" tab > click the commit that did pod update > see if pods changes is on the file changes record
3/ If you don't see pods changes, that means you do not push these changes successfully.
4/ Check .gitignore file, make sure it doesn't contain syntax like: pods/*
For anyone who stumbles on this later, I wasn't able to figure out how to fix the missing file issue so I simply rolled back the project to a git before the pod update.
I was using 0.37.2 pod version on previous mac version. Its not working on Sierra. If i upgrade the pods, Restkit creates an issue for File not found. Tried all the possible answers to make Restkit work on new pod version but no success. If someone else got the same issue, what is the fix?
[!] Unable to load a specification for the plugin /Users/q/.rvm/gems/ruby-2.0.0-p648/gems/cocoapods-deintegrate-1.0.1
Analyzing dependencies
[!] The master repo requires CocoaPods 1.0.0 - (currently using 0.37.2)
Update CocoaPods, or checkout the appropriate tag in the repo.
http://blog.cocoapods.org/Sharding/
using old specs worked.
For people who want to continue using 0.x versions, we will be
replicating the Specs repo from the commit before the repo was
sharded. This means you can add:
source "https://github.com/CocoaPods/Old-Specs"
To the top of your Podfile, and CocoaPods will only use the archived
repo, instead of using the new repo structure. You will also need to
set your local Specs repo to a version before the transition:
cd ~/.cocoapods/repos/master/ git fetch origin master git checkout
v0.32.1
I am presently taking a course in iOS development and we use Github to submit work to instructors. Last night, I did an assignment on a project I've been working on for several days, committed the repo and stopped for the day.
This morning, I began another lesson that involved installing Cocoapods. I created a branch off of last night's branch (not the master) and installed a Cocoapod on it (Xcode was closed while I installed a Cocoapod). When I realized I was working off the wrong branch, I switched to the master branch and typed
git branch -d install-cocoapods to remove the local branch
I then checked out the master, opened it in Xcode thinking I'd see my master file, but I see remnants of Cocoapods. I checked Github and I see the last update was last night, but I can't get rid of the local references to the Cocoapods I attempted to install in on the wrong branch from this morning.
I checked Github and the project I saved last night is there, but I've been unsuccessful nuking local references to my project. How would I get rid of them and start with a clean "master" file from Github?
Remove all Pod files with this command:
rm -rf Podfile.lock Pods/
Stash all changes and then move to master:
git stash -a
git checkout master
Now write new Podfile and run:
pod install
I normally use git clean -fxd.
This single command will remove all untracked and ignored files and directories, and, most of the time, take your repo back to it's "cleanest" state.
But beware that this command will potentially remove any files that haven't been tracked. So please make sure that you have all the files you want to keep tracked.
I've been using Cocoapods without any problems on my projects for a while now, but today I suddenly got this error while trying to update my pods on a particular project:
[!] Pod::Executable pull
Your configuration specifies to merge with the ref 'master'
from the remote, but no such ref was fetched.
I have been trying to work out what is causing this issue but to no avail (it happens on all projects that use Cocoapods during the "Analyzing dependencies" stage).
Does anyone know what's causing this (and how to resolve it)?
This looks like an issue with the git repository that all of CocoaPod's specs come from. It lives in ~/.cocoapods. To fix issues like this the easiest way is to just delete it entirely with rm -rf ~/.cocoapods and set it up again with pod setup
EDIT:
Today (1/30/14) there was an issue with the specs repo that may make you want to fix this. Read more about it on the CocoaPods Blog
I am working on a project using cocoapods and suddenly I see myself doing some changes in one of the libraries. How can I ensure that those changes will never be override by a pod update? Is there any way to introduce changes in a pod without updating the github project?
UPDATE : Forking a project
I have tried to fork the project and create a new specfile to point to the new project. I was able to install the basic stuff, however, for some reason, there are some dependencies that are installed but can't be referenced inside the pods project. Currently I have this in my podsfile:
'WhirlyGlobe', :podspec => 'https://raw.github.com/tiagoalmeida/WhirlyGlobe/master/WhirlyGlobe.podspec'
The fork of the library is in https://github.com/tiagoalmeida/WhirlyGlobe
UPDATE2: Missing Headers
I have found that the headers (Pods/Headers) for boost and Eigen (used from the WhrilyGlobe) are not being generated.
UPDATE3: Trying to do Something about the headers
I have tried to look in some of the configurations that are in this thread and I have tried the solutions in the FAQ but I believe that my problem is different. The headers are actually missing.
UPDATE4: Attacking the cocoapods version
I have uninstalled cocoapods and installed the version 0.20.2 (that was working before trying to use my fork) and it keeps all the same :/.
#pgb and wattson provided me good information but ultimately the problem was in a combination of things.
I don't know why but it seems that cocoapods 0.22 handles headers differently. I uninstalled cocoapods and installed the version 0.20.2.
To check the version of cocoapods I have used gem query and I have removed the cocoapods with gem uninstall cocoapods and installed the cocoapods with gem install cocoapods --version 0.20.2.
I have used my podfile like this:
'WhirlyGlobe', :podspec => 'https://raw.github.com/tiagoalmeida/WhirlyGlobe/master/WhirlyGlobe.podspec'
Where podspec points to my new podspec. I made like this because I need to remove the :tag from the original podfile (otherwise it always points to the same spot) and this way I have more control over the file.
In the podspec I have changed the source:
s.source = { :git => "https://github.com/tiagoalmeida/WhirlyGlobe.git"}
To point into my fork and removed the tag.
Thanks #pgb and #wattson for the attempts to help me. Upvoted both because they were both usefull.
You can fork a repository and then add your forked repo as a pod, so say you've forked the repo to https://github.com/tiago/ThePodProject.git, then set the pod to:
pod 'ThePodProject', :git => 'https://github.com/tiago/ThePodProject.git'
see here for more detail (under "From a podspec in the root of a library repo")
You are close to having it working with your forked repository.
I just tried it with the following Podfile:
pod 'WhirlyGlobe', :git => 'https://github.com/tiagoalmeida/WhirlyGlobe'
It downloaded WhirlyGlobe and then failed because hg was missing. I simply installed it using Homebrew: brew install mercurial and then runnning pod install was able to install all the dependencies.
The project compiles, but I'm not sure it works, go ahead and try it.
Be aware that it took a really long time to download and compile all the dependencies (shapelib in particular).
Just want to add my few cent to the answer.
I encounter the same problem. As someone suggested above too I went to subclass-ing the pod lib.
I was using ACEDrawingView and it has property image which is readonly.
I subclass-ed it and made this property read/write.
I personal feel going by sub-class is more elegant and hassle free solution to this kind of problem.
Unless there is huge development you want to do on side of your main project.
Saving custom changes using only Git (no forking)
For those looking for a simple solution, I have successfully solved this problem by using git stashes.
As mentioned, pod update will overwrite any changes you made. However, if you're using git what I like to do is commit all my changes except for my pod changes.
Once the only changes I have on my branch are the Pods changes, I stash those changes by running git stash save "Custom Cocoapod changes, apply after every pod update". You can give it any message you'd like by changing the text between the "".
This command has the side effect of reseting your working directory to the previous HEAD, so if you want to reapply those stashes you can just run git stash apply to get those changes back in, and then you can commit them to save them.
Don't use git stash pop as this will delete the stash after applying it.
Now, at some undetermined time in the future, when you update your pods and its time to apply the stash again, what you're going to want to do is run git stash list. this will return a list of all the stashes you've made with the most recent being zero indexed. You'll probably see something like this:
stash#{0}: On featureFooBar: foo bar
stash#{1}: On Master: Custom Cocoapod changes, apply after every pod update
...
If the custom cocoa pods changes stash is in stash#{0} then perfect, you can just run a git stash apply again and you'll get those changes on your working directory. Otherwise once you find which stash number your pods changes are you can apply that stash by running git stash apply stash#{1}
Applying stashes is easiest when you have a clean working directory on the same branch but thats not required. This page gives a good description of git stash and how to use it otherwise.
This is not the most full proof solution since I can foresee some issues when you have multiple people on the same project, but it's a simple way to solve this without resorting to more involved solutions.
There is an another way exist where you can fork the repository , modify the changes and maintain the library through cocoapods for future bug fixes and feature enhancement .....
I have recently published tutorial for the same here https://medium.com/#mihirpmehta/how-to-modify-cocoapods-library-within-pods-647d2bf7e1cb