错误解析'Gemfile'，意外<<，

-5

我昨天开始了一个新的rails项目，一切正常。当我试图运行rails server或bundle install。 [！]错误解析'Gemfile'，意外<<，

出现错误解析Gemfile：语法错误，意想不到的< <，期待最终的输入 - < < < < < < < HEAD ^。 Bundler无法继续。

＃from/home/jhyatt/code/portfolio/Gemfile：10＃ ------------------------------ ------------- ##捆绑边缘轨道代替：宝石 '轨道'，github上： '轨道/轨道'
< < < < < < < HEAD＃宝石 '轨道'，“〜 > 5.1.3'

的Gemfile：

source 'https://rubygems.org' 

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


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' 
<<<<<<< HEAD 
gem 'rails', '~> 5.1.3' 
======= 
gem 'rails', '~> 5.1.1' 
>>>>>>> 7eea851168152eafdda270b0524cef1d563dc203 
# Use sqlite3 as the database for Active Record 
gem 'sqlite3' 
# Use Puma as the app server 
gem 'puma', '~> 3.7' 
# Use SCSS for stylesheets 
gem 'sass-rails', '~> 5.0' 
# Use Uglifier as compressor for JavaScript assets 
gem 'uglifier', '>= 1.3.0' 
# See https://github.com/rails/execjs#readme for more supported runtimes 
# gem 'therubyracer', platforms: :ruby 

<<<<<<< HEAD 
#Bootstrap-sass 
gem 'bootstrap-sass', '~> 3.3.6' 

======= 
>>>>>>> 7eea851168152eafdda270b0524cef1d563dc203 
# Use CoffeeScript for .coffee assets and views 
gem 'coffee-rails', '~> 4.2' 
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks 
gem 'turbolinks', '~> 5' 
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder 
gem 'jbuilder', '~> 2.5' 
# Use Redis adapter to run Action Cable in production 
# gem 'redis', '~> 3.0' 
# Use ActiveModel has_secure_password 
# gem 'bcrypt', '~> 3.1.7' 

# Use Capistrano for deployment 
# gem 'capistrano-rails', group: :development 

group :development, :test do 
    # Call 'byebug' anywhere in the code to stop execution and get a debugger console 
    gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] 
    # Adds support for Capybara system testing and selenium driver 
    gem 'capybara', '~> 2.13' 
    gem 'selenium-webdriver' 
end 

group :development do 
    # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. 
    gem 'web-console', '>= 3.3.0' 
    gem 'listen', '>= 3.0.5', '< 3.2' 
    # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring 
    gem 'spring' 
    gem 'spring-watcher-listen', '~> 2.0.0' 
end 

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem 
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

来源

2017-08-13 Joseph

看起来您需要删除合并冲突标记。 –

清洁你Gemfile，消除合并冲突并重试。同时验证您需要的Rails版本：

source 'https://rubygems.org' 

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.1.3' 
gem 'sqlite3' 
gem 'puma', '~> 3.7' 
gem 'sass-rails', '~> 5.0' 
gem 'uglifier', '>= 1.3.0' 
gem 'bootstrap-sass', '~> 3.3.6' 
gem 'coffee-rails', '~> 4.2' 
gem 'turbolinks', '~> 5' 
gem 'jbuilder', '~> 2.5' 

group :development, :test do 
    gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] 
    gem 'capybara', '~> 2.13' 
    gem 'selenium-webdriver' 
end 

group :development do 
    gem 'web-console', '>= 3.3.0' 
    gem 'listen', '>= 3.0.5', '< 3.2' 
    gem 'spring' 
    gem 'spring-watcher-listen', '~> 2.0.0' 
end 

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

来源

2017-08-13 17:59:03

谢谢你塞巴斯蒂安。我是新来的，到处找，并没有发现任何工作。再次感谢！ – Joseph

错误解析'Gemfile'，意外<<，

回答

相关问题