从另一个本地分支推送到heroku

Question

我有2个分支:development,some_other_name.我已经将some_other_name分支作为开发的子分支推送到heroku,我测试了我的代码然后切换到开发,在dev分支中做了一些代码更改,但是当我试图将它推送到heroku时我接下来:

To git@myapp.git
 ! [rejected]        development -> master (non-fast-forward)
error: failed to push some refs to 'git@myapp.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and merge the remote changes
hint: (e.g. 'git pull') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

这意味着我必须将some_other_name分支合并到开发中.有没有办法不合并这些分支,而只推动开发而不是？

Answer 1

是的,你可以--force在推送到heroku时使用选项.

$ git push -f heroku development:master