Gemfile.lock contains merge conflicts

前端 未结 3 2111
春和景丽
春和景丽 2021-02-19 16:03

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          


        
3条回答
  •  日久生厌
    2021-02-19 16:13

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

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

提交回复
热议问题