GitHubからpullするときにfatal: refusing to merge unrelated historiesとエラーが出るときの対処法

#GitHub  #Git 

GitHubでレポジトリを作成するときにREADME.mdやライセンスを追加してやると，ローカルで作ったレポジトリをそこへpushするときにエラーが出る．

$ git push origin master
To https://github.com/TRSasasusu/ほげほげ
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://github.com/TRSasasusu/ほげほげ'
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.

そこで，README.mdやライセンスの差分をローカルに落とすためにpullすると，

$ git pull origin master
warning: no common commits
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (4/4), done.
From https://github.com/TRSasasusu/ほげほげ
 * branch            master     -> FETCH_HEAD
 * [new branch]      master     -> origin/master
fatal: refusing to merge unrelated histories

とこちらもエラーが出てしまう．このエラーを回避してpullするには，

$ git pull --allow-unrelated-histories origin master

としてやれば良い．これであとは

$ git push origin master

でリモートレポジトリにpushできる．