Gemfile.lock contains merge conflicts

Question

I just ran git push origin master and got this error after trying to run rails s:

Your Gemfile.lock contains merge conflicts.
Run `git          


        

Answer 1

Gems that were used in any branch should have been add to the Gemfile. Therefore you can checkout the most recent clean Gemfile.lock with:

git checkout HEAD -- Gemfile.lock

And then run bundle install to install the necessary gems and regenerate the Gemfile.lock