Question

我宁愿不写这个。但痛苦的是，我不知道冲突是什么或其他什么，我在gemfile.lock中发现它并删除它！我读过有人说不这样做。所以我不知道如何解决我的问题。这是我的gemfile和gemfile.lock。

--------＆gt; Gemfile＆lt; ----------

source 'https://rubygems.org'



ruby '2.2.6'

git_source(:github) do |repo_name|
  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
  "https://github.com/#{repo_name}.git"
end


gem 'rails', '~> 5.0.1'
gem 'puma', '~> 3.0'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.2'
gem 'jquery-rails'


gem 'jquery-ui-rails', '~> 5.0.5'
gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.5'
gem 'bootstrap', '~> 4.0.0.alpha6'
gem 'devise'
gem 'activeadmin', '~> 1.0.0.pre5'
gem 'inherited_resources', github: 'activeadmin/inherited_resources'
group :development, :test do
  gem 'byebug', platform: :mri
   gem 'sqlite3'
end

group :development do
  gem 'web-console', '>= 3.3.0'
end

group :production do
    gem 'pg'
end

gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

---------＆GT; Gemfile在这里结束＆lt; --------

        GIT
       remote: https://github.com/activeadmin/inherited_resources.git
  revision: eea3aa21f3867dc182e4db24d1c765bdbcb3df34
  specs:
    inherited_resources (1.7.0)
      actionpack (>= 3.2, < 5.1)
      has_scope (~> 0.6)
      railties (>= 3.2, < 5.1)
      responders

GEM
  remote: https://rubygems.org/
  specs:
    actioncable (5.0.2)
      actionpack (= 5.0.2)
      nio4r (>= 1.2, < 3.0)
      websocket-driver (~> 0.6.1)
    actionmailer (5.0.2)
      actionpack (= 5.0.2)
      actionview (= 5.0.2)
      activejob (= 5.0.2)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
    actionpack (5.0.2)
      actionview (= 5.0.2)
      activesupport (= 5.0.2)
      rack (~> 2.0)
      rack-test (~> 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
    actionview (5.0.2)
      activesupport (= 5.0.2)
      builder (~> 3.1)
      erubis (~> 2.7.0)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.3)
    activeadmin (1.0.0.pre5)
      arbre (~> 1.0, >= 1.0.2)
      bourbon
      coffee-rails
      formtastic (~> 3.1)
      formtastic_i18n
      inherited_resources (~> 1.6)
      jquery-rails

--------＆gt; GEMFILE.LOCK在此处结束＆lt; ------------

Answer 1

您可以删除Gemfile.lock并运行以下命令，即

bundle install

它将再次创建Gemfile.lock并添加依赖项gem。

在Gemfile.lock中删除了合并冲突

1 个答案: