Railsでgit操作をしてるのですがエラーになります
railsチュートリアル通りに進めており
「git push -u origin --all」をすると下記エラーがおきました。
Enter passphrase for key '/c/Users/git/.ssh/id_rsa': To bitbucket.org:git/tutorial.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'git@bitbucket.org:git/tutorial.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.
調べていく中で「git fetch」を打ち込んだあとに
「git merge --allow-unrelated-histories origin/master」をうちこむと下記エラーに・
error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict.
再度「git push -u origin --all」をすると下記エラーがおきます。
Enter passphrase for key '/c/Users/git/.ssh/id_rsa': To bitbucket.org:git/tutorial.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'git@bitbucket.org:git/tutorial.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.
昨日の朝からやっていますが、もう疲れてしまいました。ご助言お願いします。
回答2件
あなたの回答
tips
プレビュー
バッドをするには、ログインかつ
こちらの条件を満たす必要があります。
2019/08/24 15:57