尝试git push to remote branch时遇到错误(Heroku)

Question

嗨,我试图将我的本地更改推送到heroku生产,但我收到以下错误

Zhens-MacBook-Pro:Dailymuses-Server-Side zaikshev88$ git push heroku-production master:master
To git@heroku.com:dailymuses.git
! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@heroku.com:dailymuses.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

这里的问题是,当我试图做一个git pull时,我被告知一切都是最新的

Zhens-MacBook-Pro:Dailymuses-Server-Side zaikshev88$ git pull origin master
From github.com:mingyeow/Dailymuses-Server-Side
* branch            master     -> FETCH_HEAD
Already up-to-date.

这里有什么问题,我该如何解决？

Answer 1

你的push命令是远程的,heroku-production但你的pull命令是origin.该non-fast-foward消息表示当前仓库中的历史记录与Heroku遥控器不同; 可能有人推出了一些合并或重组的分支机构.

我恳请你不要使用Heroku作为权威的git遥控器.假设你不是,你可以强行推动Heroku master分支来解决这个问题.

git push -f heroku-production master:master