Question

github push 失败

Username for 'https://github.com': dummymare
Password for 'https://dummymare@github.com':
To https://github.com/dummymare/Hello-World.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/dummymare/Hello-World.git'
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.

Answer 1

有时候往GitHub上提交东西的时候会因为remote repository上有东西更新了但是local

repository 没有更新而造成提交失败，此时需要git pull origin master,这样就会出现一个小黑框

要求你输入为何要merge两者:press "i"->write your merge message->press "esc"->write

":wq"->then press enter,就可以继续回到输入命令的小黑框界面了。

Answer 2

$ git pull origin master --allow-unrelated-histories
先合并再push，亲测可行

Answer 3

本地版本和主干上的有差异。。。让你先pull远端的版本，解决了冲突才能push