3章のセットアップの指示通りに実行していましたが、pushするタイミングでエラーとなります。
1-2章ではなんとか上手くできたのですが、出来た理由がよくわかってないので、3章での解決方法がわかりません。。。
すみませんが、ご指導お願いします。
https://railstutorial.jp/chapters/static_pages?version=5.1#cha-static_pages
ec2-user:/environment/sample_app (master) $ git init/environment/sample_app (master) $ git add -A
Reinitialized existing Git repository in /home/ec2-user/environment/sample_app/.git/
ec2-user:
ec2-user:/environment/sample_app (master) $ git commit -m "Initialize repository"/environment/sample_app (master) $ git commit -am "Improve the README"[master 86d8004] Improve the README
[master (root-commit) 3d28315] Initialize repository
76 files changed, 1201 insertions(+)
ec2-user:
1 file changed, 41 insertions(+), 24 deletions(-)
rewrite README.md (97%)
ec2-user:/environment/sample_app (master) $ git remote add origin git@bitbucket.org:kotoneko/sample_app.git/environment/sample_app (master) $ git push -u origin --all
ec2-user:
To bitbucket.org:kotoneko/sample_app.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'git@bitbucket.org:kotoneko/sample_app.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
ググって色々試しましたが、ダメでした。。。
https://qiita.com/takanatsu/items/fc89de9bd11148da1438
ec2-user:~/environment/sample_app (master) $ git fetch
warning: no common commits
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From bitbucket.org:kotoneko/sample_app
- [new branch] master -> origin/master
ec2-user:/environment/sample_app (master) $ git merge origin/master/environment/sample_app (master) $ git push -u origin master
fatal: refusing to merge unrelated histories
ec2-user:
To bitbucket.org:kotoneko/sample_app.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@bitbucket.org:kotoneko/sample_app.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
ec2-user:/environment/sample_app (master) $ git --version/environment/sample_app (master) $ git fetch && git merge origin/master
git version 2.14.4
ec2-user:
fatal: refusing to merge unrelated histories
ec2-user:/environment/sample_app (master) $ git merge --allow-unrelated-histories origin/master/environment/sample_app (master|MERGING) $
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
ec2-user:
あと、(master|MERGING)を(master)にするにはどうすればいいのでしょうか??
よろしくお願いします。。
バッドをするには、ログインかつ
こちらの条件を満たす必要があります。