0
0

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 1 year has passed since last update.

Git備忘録

Posted at

[rejected] master -> master (non-fast-forward)

とリジェクトされた。

今回の原因は、WEBでのGitHub上で、README.mdを編集。
それを忘れて、そのままPULLせずにローカルで続行。お粗末。

そして、PUSHしようとコマンドを打ったら、上記リジェクト発生。

対処方法

$ git merge --allow-unrelated-histories
というコマンドを打って、とりあえずマージさせる。

ようやくPUSH完了。

いまだにマークダウン方式というのがよくわかっておらず。。。
参照元:https://qiita.com/hiroki-it/items/1671514eb659880e5bef

でもこんな便利なツールがあるとは。。もっと早く使っておいてもよかったかな。

0
0
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
0
0

Delete article

Deleted articles cannot be recovered.

Draft of this article would be also deleted.

Are you sure you want to delete this article?