gitは、以下の順で実施しえちます。 $ rails test $ git add -A warning: LF will be replaced by CRLF in app/assets/javascripts/account_activations.coffee. The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in app/assets/stylesheets/account_activations.scss. The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in app/controllers/account_activations_controller.rb. The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in app/helpers/account_activations_helper.rb. The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in app/mailers/user_mailer.rb. The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in app/views/user_mailer/account_activation.html.erb. The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in app/views/user_mailer/account_activation.text.erb. The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in app/views/user_mailer/password_reset.html.erb. The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in app/views/user_mailer/password_reset.text.erb. The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in db/migrate/20200112080817_add_activation_to_users.rb. The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in test/controllers/account_activations_controller_test.rb. The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in test/mailers/previews/user_mailer_preview.rb. The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in test/mailers/user_mailer_test.rb. The file will have its original line endings in your working directory $ git commit -m "Add account activation" [account-activation 90ea9d4] Add account activation 30 files changed, 247 insertions(+), 69 deletions(-) create mode 100644 app/assets/javascripts/account_activations.coffee create mode 100644 app/assets/stylesheets/account_activations.scss create mode 100644 app/controllers/account_activations_controller.rb create mode 100644 app/helpers/account_activations_helper.rb create mode 100644 app/mailers/user_mailer.rb create mode 100644 app/views/user_mailer/account_activation.html.erb create mode 100644 app/views/user_mailer/account_activation.text.erb create mode 100644 app/views/user_mailer/password_reset.html.erb create mode 100644 app/views/user_mailer/password_reset.text.erb create mode 100644 db/migrate/20200112080817_add_activation_to_users.rb create mode 100644 test/controllers/account_activations_controller_test.rb delete mode 100644 test/integration/user_signup_test.rb create mode 100644 test/mailers/previews/user_mailer_preview.rb create mode 100644 test/mailers/user_mailer_test.rb $ git checkout master Switched to branch 'master' Your branch is up to date with 'origin/master'. $ git merge account-activation $ git merge account-activation error: cannot stat 'app/views/user_mailer': Permission denied error: cannot stat 'app/views/user_mailer': Permission denied error: cannot stat 'app/views/user_mailer': Permission denied error: cannot stat 'app/views/user_mailer': Permission denied Updating a79ce83..90ea9d4 上記エラーのapp/views/user_mailer.rbのコードです。 ↓ class UserMailer < ApplicationMailer # Subject can be set in your I18n file at config/locales/en.yml # with the following lookup: # # en.user_mailer.account_activation.subject # def account_activation(user) @user = user mail to: user.email, subject: "Account activation" end # Subject can be set in your I18n file at config/locales/en.yml # with the following lookup: # # en.user_mailer.password_reset.subject # def password_reset @greeting = "Hi" mail to: "to@example.org" end end ```### 前提・実現したいこと 現在、Railsチュートリアルの第11章を最終git mergeすると、記述したcodeが全て消え、記述前状態に戻ってしまいます。 2回やってみましたが、2回とも同じ現象になり、また、エディター(Atom)を消そうとするとsaveにするとそのまま閉じずに エクスプローラーが立ち上がりaccount_activation.text.erbファイルの保存を促してきます。 というより、保存しないとエディターが閉じませんでした。 一体、何が起こっているのか見当もつかず困惑している状況です。 詳しい方、居られましたらアドバイス頂けないでしょうか。 よろしくお願いします。 ### 発生している問題・エラーメッセージ
エラーメッセージ
### 該当のソースコード ```ここに言語名を入力 ソースコード
試したこと
ここに問題に対して試したことを記載してください。
補足情報(FW/ツールのバージョンなど)
ここにより詳細な情報を記載してください。
回答2件
あなたの回答
tips
プレビュー