'Git push heroku master'命令出错

Question

我正在尝试将代码从我的应用程序更新到我的存储库,并出现错误.

我该如何解决？

C:\Sites\ecozap>git push heroku master
Enter passphrase for key '/c/Users/Diseño2/.ssh/id_rsa':
Fetching repository, done.
To git@heroku.com:ecozap.git
! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@heroku.com:ecozap.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.

Answer 1

此错误意味着masterHeroku 上的分支包含不在本地分支中的提交.

您可以从Heroku中提取缺少的提交并将它们合并到本地副本中:

git pull heroku master

或者,如果你不关心丢失的提交,你可以强制推送到Heroku.这将使用您的本地提交覆盖Heroku上的远程仓库.

git push --force heroku master

确保你真的不关心它们,因为你会通过这样做从Heroku中失去它们.通常情况下这并不重要,因为Heroku通常不是规范的回购,其他地方如GitHub.