Xcode server and Cocoapods : Your local changes to the following files would be overwritten by merge.

Hi all,

Sorry for the delay, I have been busy building up a Swift 3 framework for OpenGL and Vuforia.

Back to our main topic.  I recently built an Xcode server for my project.  The project uses Cocoapods and for a time it was good then, a few days ago, a build exited with the error :

Your local changes to the following files would be overwritten by merge.

And has been failing ever since until I found the solution.  It seems the cocoa pods repo gets messed up sometime and you need to hard reset it to HEAD.  Here how :

cd ~/.cocoapods/repos/master

git reset HEAD –hard

Takes a couple of minutes and then you should be just fine !

Enjoy 🙂

MAB

2 thoughts on “Xcode server and Cocoapods : Your local changes to the following files would be overwritten by merge.”

  1. I have noticed you don’t monetize your blog, don’t waste your traffic,
    you can earn additional cash every month because you’ve
    got high quality content. If you want to know how to make extra
    money, search for: Boorfe’s tips best adsense
    alternative

Leave a Reply

Your email address will not be published. Required fields are marked *