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

You can edit Gemfile.lock to get rid of the conflicts manually

http://rubyinrails.com/2013/12/what-is-gemfile-lock/