为什么即使我拉了之后我的推动也被拒绝了？

Question

$ git branch
  master
* portal
$ git fetch
$ git merge origin/portal
Already up-to-date.
$ git pull
Already up-to-date.
$ git push
To git@github.com:ripper234/Commerce-Sciences.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:ripper234/Commerce-Sciences.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.

通常我会gitk -all尝试看看到底发生了什么,但这是在没有图形shell的Linux机器上.

Answer 1

请注意错误消息中的这一行:

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

你合并了portal分支,但你也试图推送master,因为git push默认情况下会尝试推送所有存在的分支origin.试试这个:

$ git push origin portal