Git 错误 : ! [rejected] master -> master (non-fast-forward)

Question

我正在更新我的项目，当我试图将它上传到我的存储库时，出现了以下错误:

已经做了

git pull --rebase origin master

  ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://*******/production.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.

我需要更新我的网站，但无法这样做。

编辑 1:

> git status 给出:

rebase in progress; onto cda02b2 You are currently rebasing branch 'master' on 'cda02b2'. (all conflicts fixed: run "git rebase --continue")

nothing to commit, working directory clean

Answer 1

正如 git 在输出中告诉你的 似乎已经有一个 rebase-apply 目录，我想知道你是否正在另一个 rebase 中。如果是这种情况，请尝试 git rebase (--continue | --abort | --skip) 你正处于 rebase 的中间。您首先必须通过

中止或继续此 rebase

git rebase --continue 或

git rebase --abort

然后用

再次 pull

git pull --rebase origin master