title: pod install not working after updating cocoapods to 0.29
body: <p>Here is what i did and got error. 
  I wanted to use grabkit : <a href="https://github.com/pierrotsmnrd/grabKit" rel="nofollow">https://github.com/pierrotsmnrd/grabKit</a> 
  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 -- </p>
  
  <p>"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'"</p>
  
  <p>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) </p>