Q&A
<<<<<<< Updated upstream って、git でコンフリクトしたままコミットしたのでは。
前提・実現したいこと
herokuにてデプロイを完了させたいです
git push heroku masterをするとエラーが出てしまいます
発生している問題・エラーメッセージ
Enumerating objects: 508, done. Counting objects: 100% (508/508), done. Delta compression using up to 8 threads Compressing objects: 100% (476/476), done. Writing objects: 100% (508/508), 208.54 KiB | 4.44 MiB/s, done. Total 508 (delta 250), reused 0 (delta 0) remote: Compressing source files... done. remote: Building source: remote: remote: -----> Building on the Heroku-18 stack remote: -----> Determining which buildpack to use for this app remote: ! Warning: Multiple default buildpacks reported the ability to handle this app. The first buildpack in the list below will be used. remote: Detected buildpacks: Ruby,Node.js remote: See https://devcenter.heroku.com/articles/buildpacks#buildpack-detect-order remote: -----> Ruby app detected remote: -----> Installing bundler 2.2.11 remote: -----> Removing BUNDLED WITH version in the Gemfile.lock remote: -----> Compiling Ruby/Rails remote: -----> Using Ruby version: ruby-2.6.5 ~~~~~~~~~~省略しました~~~~~ remote: Bundle complete! 21 Gemfile dependencies, 67 gems now installed. remote: Gems in the groups development and test were not installed. remote: Bundled gems are installed into `./vendor/bundle` remote: Post-install message from sass: remote: remote: Ruby Sass has reached end-of-life and should no longer be used. remote: remote: * If you use Sass as a command-line tool, we recommend using Dart Sass, the new remote: primary implementation: https://sass-lang.com/install remote: remote: * If you use Sass as a plug-in for a Ruby web framework, we recommend using the remote: sassc gem: https://github.com/sass/sassc-ruby#readme remote: remote: * For more details, please refer to the Sass blog: remote: https://sass-lang.com/blog/posts/7828841 remote: remote: Bundle completed (31.82s) remote: Cleaning up the bundler cache. remote: -----> Installing node-v12.16.2-linux-x64 remote: -----> Installing yarn-v1.22.4 remote: -----> Detecting rake tasks remote: -----> Preparing app for Rails asset pipeline remote: Running: rake assets:precompile remote: rake aborted! remote: SyntaxError: /tmp/build_f03cddae/config/initializers/devise.rb:17: syntax error, unexpected << remote: <<<<<<< Updated upstream remote: ^~ remote: /tmp/build_f03cddae/config/initializers/devise.rb:19: syntax error, unexpected ===, expecting end remote: ======= remote: ^~~ remote: /tmp/build_f03cddae/config/initializers/devise.rb:133: syntax error, unexpected <<, expecting end-of-input remote: <<<<<<< Updated upstream remote: ^~ remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/bootsnap-1.7.3/lib/bootsnap/load_path_cache/core_ext/kernel_require.rb:59:in `load' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/bootsnap-1.7.3/lib/bootsnap/load_path_cache/core_ext/kernel_require.rb:59:in `load' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.6/lib/active_support/dependencies.rb:318:in `block in load' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.6/lib/active_support/dependencies.rb:291:in `load_dependency' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.6/lib/active_support/dependencies.rb:318:in `load' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/engine.rb:666:in `block in load_config_initializer' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.6/lib/active_support/notifications.rb:182:in `instrument' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/engine.rb:665:in `load_config_initializer' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/engine.rb:625:in `block (2 levels) in <class:Engine>' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/engine.rb:624:in `each' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/engine.rb:624:in `block in <class:Engine>' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/initializable.rb:32:in `instance_exec' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/initializable.rb:32:in `run' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/initializable.rb:61:in `block in run_initializers' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/initializable.rb:50:in `each' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/initializable.rb:50:in `tsort_each_child' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/initializable.rb:60:in `run_initializers' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/application.rb:363:in `initialize!' remote: /tmp/build_f03cddae/config/environment.rb:5:in `<main>' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/bootsnap-1.7.3/lib/bootsnap/load_path_cache/core_ext/kernel_require.rb:23:in `require' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/bootsnap-1.7.3/lib/bootsnap/load_path_cache/core_ext/kernel_require.rb:23:in `block in require_with_bootsnap_lfi' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/bootsnap-1.7.3/lib/bootsnap/load_path_cache/loaded_features_index.rb:92:in `register' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/bootsnap-1.7.3/lib/bootsnap/load_path_cache/core_ext/kernel_require.rb:22:in `require_with_bootsnap_lfi' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/bootsnap-1.7.3/lib/bootsnap/load_path_cache/core_ext/kernel_require.rb:31:in `require' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/zeitwerk-2.4.2/lib/zeitwerk/kernel.rb:34:in `require' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.6/lib/active_support/dependencies.rb:324:in `block in require' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.6/lib/active_support/dependencies.rb:291:in `load_dependency' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/activesupport-6.0.3.6/lib/active_support/dependencies.rb:324:in `require' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/application.rb:339:in `require_environment!' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/railties-6.0.3.6/lib/rails/application.rb:523:in `block in run_tasks_blocks' remote: /tmp/build_f03cddae/vendor/bundle/ruby/2.6.0/gems/sprockets-rails-3.2.2/lib/sprockets/rails/task.rb:61:in `block (2 levels) in define' remote: Tasks: TOP => environment remote: (See full trace by running task with --trace) remote: remote: ! remote: ! Precompiling assets failed. remote: ! remote: ! Push rejected, failed to compile Ruby app. remote: remote: ! Push failed remote: Verifying deploy... remote: remote: ! Push rejected to event-todo. remote: To https://git.heroku.com/event-todo.git ! [remote rejected] master -> master (pre-receive hook declined) error: failed to push some refs to 'https://git.heroku.com/event-todo.git'
試したこと
ネットに書いてあったことを実行し
config/initializers/devise.rbにて config.scoped_views = trueを記入
また
config/environments/production.rbにて config.assets.initialize_on_precompile = falseを記入
event-todo % git branch
comment機能
event作成
* master
task作成
user_view
ユーザー登録
event-todo % git fetch --prune
event-todo % git branch -r
origin/comment機能
origin/event作成
origin/master
origin/task作成
origin/user_view
origin/ユーザー登録
event-todo % git fetch --prune
event-todo % git checkout user_view
Switched to branch 'user_view'
Your branch is up to date with 'origin/user_view'.
event-todo % git pull origin user_view
From https://github.com/takahiro-sekine/event-todo
* branch user_view -> FETCH_HEAD
Already up to date.
event-todo % git checkout b_branch
error: pathspec 'b_branch' did not match any file(s) known to git
event-todo % git checkout user_view
Already on 'user_view'
Your branch is up to date with 'origin/user_view'.
event-todo % git merge user_view
Already up to date.
event-todo % git merge master
Merge made by the 'recursive' strategy.
app/controllers/comments_controller.rb | 1 +
app/controllers/tasks_controller.rb | 5 ++---
app/controllers/users_controller.rb | 1 -
app/models/event.rb | 3 ++-
app/models/task.rb | 1 +
config/environments/production.rb | 1 +
config/initializers/devise.rb | 9 +++++++++
ご回答ありがとうございます
初学者で申し訳ございません
ネットにてコンフリクトについて調べ
実践して pushしてみましたができませんでした。
あなたの回答
tips
プレビュー
