2
1

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?

More than 3 years have passed since last update.

git push をしたら reject されるときの解決法

Posted at

やったこと

  1. GitHubのアカウントを作る
  2. ローカルとリモートをリンクさせる
  3. ローカルで適当なファイルを作る
  4. コミットしたあとにgit push origin masterを叩く

エラー内容

To https://github.com/○○○○/○○○○.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/○○○○/○○○○.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 merge --allow-unrelated-histories origin/master

なぜ起きたか

GitHubで新しいリポジトリを作る時にREADME.mdを同時に作るとリモートとローカルに差分がでる

先にリモートの内容をローカルにマージしてからpushしてね、となる

2
1
0

Register as a new user and use Qiita more conveniently

  1. You get articles that match your needs
  2. You can efficiently read back useful information
  3. You can use dark theme
What you can do with signing up
2
1

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?