Help us understand the problem. What is going on with this article?

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

やったこと

  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してね、となる

RyotaKanemoto
マッチングアプリの企画・開発・運営を行っております。 PHPer歴2年強です。
Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away
Comments
No comments
Sign up for free and join this conversation.
If you already have a Qiita account
Why do not you register as a user and use Qiita more conveniently?
You need to log in to use this function. Qiita can be used more conveniently after logging in.
You seem to be reading articles frequently this month. Qiita can be used more conveniently after logging in.
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away
ユーザーは見つかりませんでした