Talk about Gemfile.lock merge conflicts

[indirect]

It would be handy to have a section (maybe in the FAQ? maybe in getting started) that explains how to handle merge conflicts on the Gemfile.lock file. If you're using git, the easy way to fix a merge conflict is git checkout HEAD -- Gemfile.lock && bundle install. There are a couple of scripts that will set git up to do this for you automatically. One is a pretty simple gist that sets a git merge resolution driver and one is a git hook that also runs database migrations in rails apps.

[pmackay]

I'm getting this message and there are no git conflicts. I've complete regenerated it and still the same message of

Your Gemfile.lock contains merge conflicts.
Run `git checkout HEAD -- Gemfile.lock` first to get a clean lock.

any other reason that causes this?

[segiddins]

Can you share the output of bundle env in a new issue, @pmackay ?

[pmackay]

I've found that bundle was referencing a Gemfile.lock in an earlier project that I had renamed. Even though I was definitely in a new project dir and the Gemfile.lock was fine in there. To resolve it I had to empty my trash to get bundler to find the file in its own directory. Do you know how bundler would have cached that path?

[TimMoore]

@pmackay do you have the BUNDLE_GEMFILE environment variable set?

[pmackay]

Ah, no I didnt. Is there any other way bundler could have been referencing the older path?

[indirect]

@pmackay since you didn't supply bundle env, we have no real way to know, unfortunately. Likely reasons include BUNDLE_GEMFILE or a setting that changes the name of the Gemfile or lock file.