Menu
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.
git checkout -- Gemfile.lock to discard the changes, but that doesn't work either -- the local changes just stay there. 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.
650
You should always include your Gemfile. lock if you are writing an application. The community seems to (largely) agree that you should include it in any Gems you create as well.
The Gemfile. lock file is where Bundler records the exact versions that were installed. This way, when the same library/project is loaded on another machine, running bundle install will look at the Gemfile.
Gemfile. lock is automatically generated when you run bundle install or bundle update . It should never be edited manually.
You can run just bundle or bundle install to install gems based on your Gemfile. That will remove the instance of mygem from your Gemfile. lock file.
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.
181
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
