Troubles with git and Gemfile.lock

ruby-on-rails git gemfile merge-conflict-resolution gemfile.lock
grautur picture grautur · Jun 14, 2015 · Viewed 9.3k times · Source

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 local changes to the following files would be overwritten by merge:
    Gemfile.lock
Please, commit your changes or stash them before you can merge.
Aborting

The problem is that I can't figure out how to fix it.

  • Stashing the file doesn't work -- the local changes just stay there for some reason.
  • I've also tried running git checkout -- Gemfile.lock to discard the changes, but that doesn't work either -- the local changes just stay there.
  • I've also tried creating a new branch and committing the Gemfile.lock changes just to that branch... but that doesn't work either. The changes remain!

What do I need to do? I've gone so far as to just clone a new git repo, but soon enough, all this starts happening again.

Answer

Tristan Havelick picture Tristan Havelick · Aug 3, 2015

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.

Related questions

Pull is not possible because you have unmerged files, git stash doesn't work. Don't want to commit

I just want to pull. I have changes to disregard, my Gemfile and Gemlock files and I'd be happy to just overwrite them and just pull. I tried stashing my changes away, this didn't work out for me. What do …

Read More
Lost my schema.rb! Can it be regenerated?

Due to some deployment issues I stopped tracking schema.rb in git. Somehow I have stuffed this up and somewhere along the way my schema.rb file has disappeared. Is there a way of regenerating schema.rb from the database …

Read More
GitLab email setup: sending via another mail server

By default gitlab has the next configuration in gitlab.yml : email: from: [email protected] host: gitlabhq.com but, I need to specify other variables (host, port, user, password, etc) to use another mail server. How I do that?

Read More