Ruby on rails Gemfile.lock包含合并冲突
我刚刚运行了Ruby on rails Gemfile.lock包含合并冲突,ruby-on-rails,terminal,bundle,gemfile,gemfile.lock,Ruby On Rails,Terminal,Bundle,Gemfile,Gemfile.lock,我刚刚运行了git push origin master,在尝试运行rails s后出现了这个错误: Your Gemfile.lock contains merge conflicts. Run `git checkout HEAD -- Gemfile.lock` first to get a clean lock. 无论是git签出头--Gemfile.lockbundle,bundle安装,还是bundle更新都无助于解决此问题。有人知道怎么解决这个问题吗 档案: source 'ht
git push origin master
,在尝试运行rails s
后出现了这个错误:
Your Gemfile.lock contains merge conflicts.
Run `git checkout HEAD -- Gemfile.lock` first to get a clean lock.
无论是git签出头--Gemfile.lock
bundle
,bundle安装
,还是bundle
更新都无助于解决此问题。有人知道怎么解决这个问题吗
档案:
source 'https://rubygems.org'
ruby "2.1.2"
gem 'devise'
gem 'twilio-ruby', '~> 3.12'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.0.beta2'
# Use postgresql as the database for Active Record
gem 'pg'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0.0.beta1'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails', '~> 4.0.0'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# Use jQuery as the JavaScript library
gem 'jquery-rails', '~> 4.0.0.beta2'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc
group :development, :test do
# Call 'debugger' anywhere in the code to stop execution and get a debugger console
gem 'pry-byebug'
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0.0.beta4'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
end
源代码'https://rubygems.org'
ruby“2.1.2”
宝石“设计”
宝石“斜纹红宝石”,“~>3.12”
#捆绑边缘Rails:gem'Rails',github'Rails/Rails'
gem'rails','4.2.0.beta2'
#使用postgresql作为活动记录的数据库
宝石“pg”
#将SCS用于样式表
gem'sass-rails',“~>5.0.0.beta1”
#使用Uglifier作为JavaScript资产的压缩器
gem'uglifier','>=1.3.0'
#将CoffeeScript用于.js.coffee资产和视图
gem“咖啡轨”,“~>4.0.0”
#看https://github.com/sstephenson/execjs#readme 获取更多受支持的运行时
#使用jQuery作为JavaScript库
gem'jqueryrails',“~>4.0.0.beta2”
#Turbolinks使web应用程序中的以下链接更快。阅读更多:https://github.com/rails/turbolinks
gem“涡轮链接”
#轻松构建JSON API。阅读更多:https://github.com/rails/jbuilder
gem'jbuilder',“~>2.0”
#bundle exec rake doc:rails在doc/API下生成API。
gem'sdoc','~>0.4.0',组::doc
小组:开发,:测试
#在代码中的任意位置调用“调试器”以停止执行并获取调试器控制台
宝石“撬来撬去”
#在异常页面上或通过在视图中使用访问IRB控制台
gem“web控制台”,“~>2.0.0.beta4”
#Spring通过让应用程序在后台运行来加速开发。阅读更多:https://github.com/rails/spring
宝石“春天”
结束
Gemfile.lock:
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.0.beta2)
actionpack (= 4.2.0.beta2)
actionview (= 4.2.0.beta2)
activejob (= 4.2.0.beta2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.3)
actionpack (4.2.0.beta2)
actionview (= 4.2.0.beta2)
activesupport (= 4.2.0.beta2)
rack (~> 1.6.0.beta)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.3)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0.beta2)
activesupport (= 4.2.0.beta2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.3)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.0.beta2)
activesupport (= 4.2.0.beta2)
globalid (>= 0.3.0)
activemodel (4.2.0.beta2)
activesupport (= 4.2.0.beta2)
builder (~> 3.1)
activerecord (4.2.0.beta2)
activemodel (= 4.2.0.beta2)
activesupport (= 4.2.0.beta2)
arel (>= 6.0.0.beta1, < 6.1)
activesupport (4.2.0.beta2)
i18n (>= 0.7.0.beta1, < 0.8)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
arel (6.0.0.beta1)
binding_of_caller (0.7.3.pre1)
debug_inspector (>= 0.0.1)
buftok (0.2.0)
builder (3.2.2)
byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
slop (~> 3.6)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.8.0)
columnize (0.8.9)
debug_inspector (0.0.2)
debugger-linecache (1.2.0)
equalizer (0.0.9)
erubis (2.7.0)
execjs (2.2.2)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
globalid (0.3.0)
activesupport (>= 4.1.0)
hike (1.2.3)
http (0.6.2)
http_parser.rb (~> 0.6.0)
http_parser.rb (0.6.0)
i18n (0.7.0.beta1)
jbuilder (2.2.2)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (4.0.0.beta2)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0.beta, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
jwt (1.0.0)
loofah (2.0.1)
nokogiri (>= 1.5.9)
mail (2.6.1)
mime-types (>= 1.16, < 3)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
mime-types (2.4.2)
mini_portile (0.6.0)
minitest (5.4.2)
multi_json (1.10.1)
multipart-post (2.0.0)
naught (1.0.0)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
pg (0.17.1)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (2.0.0)
byebug (~> 3.4)
pry (~> 0.10)
rack (1.6.0.beta)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.2.0.beta2)
actionmailer (= 4.2.0.beta2)
actionpack (= 4.2.0.beta2)
actionview (= 4.2.0.beta2)
activejob (= 4.2.0.beta2)
activemodel (= 4.2.0.beta2)
activerecord (= 4.2.0.beta2)
activesupport (= 4.2.0.beta2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.0.beta2)
sprockets-rails (~> 3.0.0.beta1)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.4)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
railties (4.2.0.beta2)
actionpack (= 4.2.0.beta2)
activesupport (= 4.2.0.beta2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rdoc (4.1.2)
json (~> 1.4)
sass (3.4.6)
sass-rails (5.0.0.beta1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2)
sprockets (~> 2.12)
sprockets-rails (>= 2.0, < 4.0)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
simple_oauth (0.2.0)
slop (3.6.0)
spring (1.1.3)
sprockets (2.12.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (3.0.0.beta1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (~> 2.8)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
turbolinks (2.4.0)
coffee-rails
<<<<<<< HEAD
twilio-ruby (3.13.1)
builder (>= 2.1.2)
jwt (~> 1.0.0)
multi_json (>= 1.3.0)
=======
twitter (5.11.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (~> 0.0.9)
faraday (~> 0.9.0)
http (~> 0.6.0)
http_parser.rb (~> 0.6.0)
json (~> 1.8)
memoizable (~> 0.4.0)
naught (~> 1.0)
simple_oauth (~> 0.2.0)
>>>>>>> 97cefa491ac4217bdee8557c84f3657355f9b049
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
execjs (>= 0.3.0)
json (>= 1.8.0)
web-console (2.0.0.beta4)
activemodel (~> 4.0)
binding_of_caller (= 0.7.3.pre1)
railties (~> 4.0)
sprockets-rails (>= 2.0, < 4.0)
PLATFORMS
ruby
DEPENDENCIES
coffee-rails (~> 4.0.0)
jbuilder (~> 2.0)
jquery-rails (~> 4.0.0.beta2)
pg
pry-byebug
rails (= 4.2.0.beta2)
sass-rails (~> 5.0.0.beta1)
sdoc (~> 0.4.0)
spring
turbolinks
<<<<<<< HEAD
twilio-ruby (~> 3.12)
=======
twitter
>>>>>>> 97cefa491ac4217bdee8557c84f3657355f9b049
uglifier (>= 1.3.0)
web-console (~> 2.0.0.beta4)
GEM
远程:https://rubygems.org/
规格:
actionmailer(4.2.0.beta2)
actionpack(=4.2.0.beta2)
actionview(=4.2.0.beta2)
活动作业(=4.2.0.beta2)
邮件(~>2.5,>=2.5.4)
rails dom测试(~>1.0,>=1.0.3)
actionpack(4.2.0.beta2)
actionview(=4.2.0.beta2)
主动支持(=4.2.0.beta2)
机架(~>1.6.0.beta)
机架测试(~>0.6.2)
rails dom测试(~>1.0,>=1.0.3)
rails html消毒剂(~>1.0,>=1.0.1)
actionview(4.2.0.beta2)
主动支持(=4.2.0.beta2)
生成器(~>3.1)
erubis(~>2.7.0)
rails dom测试(~>1.0,>=1.0.3)
rails html消毒剂(~>1.0,>=1.0.1)
activejob(4.2.0.beta2)
主动支持(=4.2.0.beta2)
globalid(>=0.3.0)
activemodel(4.2.0.beta2)
主动支持(=4.2.0.beta2)
生成器(~>3.1)
activerecord(4.2.0.beta2)
activemodel(=4.2.0.beta2)
主动支持(=4.2.0.beta2)
arel(>=6.0.0.beta1,<6.1)
activesupport(4.2.0.beta2)
i18n(>=0.7.0.beta1,<0.8)
json(~>1.7,>=1.7.7)
小型试验(~>5.1)
线程安全(~>0.1)
tzinfo(~>1.1)
可寻址(2.3.6)
阿雷尔(6.0.0.beta1)
绑定调用方的调用(0.7.3.pre1)
调试检查程序(>=0.0.1)
buftok(0.2.0)
建造商(3.2.2)
byebug(3.5.1)
列化(~>0.8)
调试器行缓存(~>1.2)
坡度(~>3.6)
coderay(1.1.0)
咖啡轨(4.0.1)
咖啡脚本(>=2.2.0)
钢轨(>=4.0.0,<5.0)
咖啡脚本(2.3.0)
咖啡脚本源
execjs
coffee脚本源代码(1.8.0)
列化(0.8.9)
调试检查程序(0.0.2)
调试器linecache(1.2.0)
均衡器(0.0.9)
erubis(2.7.0)
execjs(2.2.2)
法拉第(0.9.0)
多部分post(>=1.2,<3)
globalid(0.3.0)
activesupport(>=4.1.0)
徒步旅行(1.2.3)
http(0.6.2)
http_parser.rb(~>0.6.0)
http_parser.rb(0.6.0)
i18n(0.7.0β1)
jbuilder(2.2.2)
activesupport(>=3.0.0,<5)
多重json(~>1.2)
jquery rails(4.0.0.beta2)
rails dom测试(~>1.0)
钢轨(>=4.2.0.beta,<5.0)
雷神(>=0.14,<2.0)
json(1.8.1)
jwt(1.0.0)
丝瓜(2.0.1)
nokogiri(>=1.5.9)
邮件(2.6.1)
mime类型(>=1.16,<3)
可记忆(0.4.2)
螺纹安全(~>0.3,>=0.3.1)
方法_来源(0.8.2)
mime类型(2.4.2)
迷你端口(0.6.0)
小型试验(5.4.2)
多线程json(1.10.1)
多部分post(2.0.0)
零(1.0.0)
nokogiri(1.6.3.1)
迷你端口(=0.6.0)
pg(0.17.1)
撬动(0.10.1)
coderay(~>1.1.0)
方法\u来源(~>0.8.1)
坡度(~>3.4)
撬块(2.0.0)
byebug(~>3.4)
撬动(~>0.10)
机架(1.6.0.beta版)
机架测试(0.6.2)
机架(>=1.0)
轨道(4.2.0.beta2)
actionmailer(=4.2.0.beta2)
actionpack(=4.2.0.beta2)
actionview(=4.2.0.beta2)
活动作业(=4.2.0.beta2)
activemodel(=4.2.0.beta2)
activerecord(=4.2.0.beta2)
主动支持(=4.2.0.beta2)
捆绑机(>=1.3.0,<2.0)
栏杆(=4.2.0.beta2)
链轮轨道(~>3.0.0.beta1)
rails-不推荐的_消毒液(1.0.3)
activesupport(>=4.2.0.alpha)
rails dom测试(1.0.4)
activesupport(>=4.2.0.beta,<5.0)
nokogiri(~>1.6.0)
rails-不推荐使用的_消毒剂(>=1.0.1)
rails html消毒剂(1.0.1)
丝瓜(~>2.0)
栏杆(4.2.0.beta2)
actionpack(=4.2.0.beta2)
主动支持(=4.2.0.beta2)
耙(大于等于0.8.7)
雷神(>=0.18.1,<2.0)
耙(10.3.2)
rdoc(4.1.2)
json(~>1.4)
sass(3.4.6)
sass轨道(5.0.0.beta1)
钢轨(>=4.0.0,<5.0)
sass(~>3.2)
链轮(~>2.12)
链轮轨道(>=2.0,<4.0)
sdoc(0.4.1)
json(~>1.7,>=1.7.7)
rdoc(~>4.0)
简单的oauth(0.2.0)
斜坡(3.6.0)
弹簧(1.1.3)
链轮(2.12.2)
徒步旅行(~>1.2)
多重json(~>1.0)
机架(~>1.0)
倾斜(~>1.1,!=1.3.0)
链轮轨道(3.0.0.beta1)
actionpack(>=4.0)
activesupport(>=4.0)
链轮(~>2.8)
雷神(0.19.1)
th
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.0.beta2)
actionpack (= 4.2.0.beta2)
actionview (= 4.2.0.beta2)
activejob (= 4.2.0.beta2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.3)
actionpack (4.2.0.beta2)
actionview (= 4.2.0.beta2)
activesupport (= 4.2.0.beta2)
rack (~> 1.6.0.beta)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.3)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0.beta2)
activesupport (= 4.2.0.beta2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.3)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.0.beta2)
activesupport (= 4.2.0.beta2)
globalid (>= 0.3.0)
activemodel (4.2.0.beta2)
activesupport (= 4.2.0.beta2)
builder (~> 3.1)
activerecord (4.2.0.beta2)
activemodel (= 4.2.0.beta2)
activesupport (= 4.2.0.beta2)
arel (>= 6.0.0.beta1, < 6.1)
activesupport (4.2.0.beta2)
i18n (>= 0.7.0.beta1, < 0.8)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
arel (6.0.0.beta1)
binding_of_caller (0.7.3.pre1)
debug_inspector (>= 0.0.1)
buftok (0.2.0)
builder (3.2.2)
byebug (3.5.1)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
slop (~> 3.6)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.8.0)
columnize (0.8.9)
debug_inspector (0.0.2)
debugger-linecache (1.2.0)
equalizer (0.0.9)
erubis (2.7.0)
execjs (2.2.2)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
globalid (0.3.0)
activesupport (>= 4.1.0)
hike (1.2.3)
http (0.6.2)
http_parser.rb (~> 0.6.0)
http_parser.rb (0.6.0)
i18n (0.7.0.beta1)
jbuilder (2.2.2)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (4.0.0.beta2)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0.beta, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
jwt (1.0.0)
loofah (2.0.1)
nokogiri (>= 1.5.9)
mail (2.6.1)
mime-types (>= 1.16, < 3)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
mime-types (2.4.2)
mini_portile (0.6.0)
minitest (5.4.2)
multi_json (1.10.1)
multipart-post (2.0.0)
naught (1.0.0)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
pg (0.17.1)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (2.0.0)
byebug (~> 3.4)
pry (~> 0.10)
rack (1.6.0.beta)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.2.0.beta2)
actionmailer (= 4.2.0.beta2)
actionpack (= 4.2.0.beta2)
actionview (= 4.2.0.beta2)
activejob (= 4.2.0.beta2)
activemodel (= 4.2.0.beta2)
activerecord (= 4.2.0.beta2)
activesupport (= 4.2.0.beta2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.0.beta2)
sprockets-rails (~> 3.0.0.beta1)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.4)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
railties (4.2.0.beta2)
actionpack (= 4.2.0.beta2)
activesupport (= 4.2.0.beta2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rdoc (4.1.2)
json (~> 1.4)
sass (3.4.6)
sass-rails (5.0.0.beta1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2)
sprockets (~> 2.12)
sprockets-rails (>= 2.0, < 4.0)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
simple_oauth (0.2.0)
slop (3.6.0)
spring (1.1.3)
sprockets (2.12.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (3.0.0.beta1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (~> 2.8)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
turbolinks (2.4.0)
coffee-rails
twilio-ruby (3.13.1)
builder (>= 2.1.2)
jwt (~> 1.0.0)
multi_json (>= 1.3.0)
twitter (5.11.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (~> 0.0.9)
faraday (~> 0.9.0)
http (~> 0.6.0)
http_parser.rb (~> 0.6.0)
json (~> 1.8)
memoizable (~> 0.4.0)
naught (~> 1.0)
simple_oauth (~> 0.2.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
execjs (>= 0.3.0)
json (>= 1.8.0)
web-console (2.0.0.beta4)
activemodel (~> 4.0)
binding_of_caller (= 0.7.3.pre1)
railties (~> 4.0)
sprockets-rails (>= 2.0, < 4.0)
PLATFORMS
ruby
DEPENDENCIES
coffee-rails (~> 4.0.0)
jbuilder (~> 2.0)
jquery-rails (~> 4.0.0.beta2)
pg
pry-byebug
rails (= 4.2.0.beta2)
sass-rails (~> 5.0.0.beta1)
sdoc (~> 0.4.0)
spring
turbolinks
twilio-ruby (~> 3.12)
twitter
uglifier (>= 1.3.0)
web-console (~> 2.0.0.beta4)
<<<<<<< HEAD
twilio-ruby (~> 3.12)
=======
twitter
>>>>>>> 97cefa491ac4217bdee8557c84f3657355f9b049