Git错误：！[拒绝] master -> master（非快进）

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 给出：

正在变基；到 cda02b2 您当前正在将分支 'master' 重新设置为 'cda02b2'。（修复所有冲突：运行“git rebase --continue”）

无需提交，工作目录干净

Answer 1

正如 git 在输出中告诉您的那样，It seems that there is already a rebase-apply directory, and I wonder if you are in the middle of another rebase. If that is the case, please try git rebase (--continue | --abort | --skip)您正处于变基中。您首先必须通过以下方式中止或继续此变基

git rebase --continue 或者

git rebase --abort

然后再次拉

git pull --rebase origin master