twitter-bootstrap - Bootstrap-sass 安装后 Gemfile 语法错误

Question

由于“未检测到支持 Cedar 的应用程序”而导致多次“git push heroku master”被拒绝后，我发现我应该运行捆绑安装。

$bundle install

    Gemfile syntax error:
      <<<<<<< HEAD
        ^
    /Users/Wes/Sites/code/omrails/Gemfile:21: syntax error, unexpected ===, expecting
    keyword_end
    =======
       ^

好的，检查 Gemfile：

source 'https://rubygems.org'

gem 'rails', '3.2.13'
gem 'jquery-rails'

group :production do
    gem 'pg'
end

group :development, :test do
  gem 'sqlite3'
end

group :assets do
  gem 'sass-rails',   '~> 3.2.3'
  gem 'coffee-rails', '~> 3.2.1'
  gem 'uglifier', '>= 1.0.3'

  <<<<<<< HEAD
  gem 'bootstrap-sass', '~>2.3.1.2'
=======
>>>>>>> edeb28700d0603990afb9005dd7d084890def28f
end

任何帮助将不胜感激，因为我是社区的新手。

Answer 1

The problem is with the

<<<<<<< HEAD

And

=======
>>>>>>> edeb28700d0603990afb9005dd7d084890def28f

These lines are results of merge between branches in your git repository, where conflicts appeared.
You should take a look at Git How To: Resolving Conflicts.

Remove those three lines and your bundle install should run properly.