Troubles with git and Gemfile.lock

Question

I keep running into the following error with my Gemfile.lock whenever I want to do a git pull or checkout a new branch.

error: Your         


        

Answer 1

This happened to me and git reset --hard HEAD from the accepted answer didn't help. However, running spring stop did the trick. I suspect spring is rewriting the file whenever it is modified to ensure that it is in sync with the code running via spring.