我目前正在做一个项目,并在两个不同的地方使用机器来完成它。我已经为正在使用的功能创建了一个分支,当我完成一些分支的工作时,我修改了对该分支的承诺,并将其推到服务器上,这样我就可以在另一台机器上停止使用的地方进行恢复。
当我试图发送修改后的承诺时,它拒绝了我的推动。我认为这是因为我正在推送一个提交,它旨在击溃功能分支的当前头部。我通常只是使用——武力。
有更好的方法吗?
mike@sleepycat:~/projects/myproject$ git pull origin topx
From heroku.com:myproject
* branch topx -> FETCH_HEAD
Already up-to-date.
mike@sleepycat:~/projects/myproject$ git add app/models/reward.rb
mike@sleepycat:~/projects/myproject$ git commit --amend
[topx 82a9880] Added topX reward
9 files changed, 106 insertions(+), 21 deletions(-)
rewrite app/views/ceo/_reward_criteria.html.erb (96%)
create mode 100644 public/javascripts/jquery.multiselect.min.js
create mode 100644 public/site/javascripts/jquery.multiselect.min.js
create mode 100644 public/stylesheets/jquery.multiselect.css
mike@sleepycat:~/projects/myproject$ git push origin topx
To git@heroku.com:myproject.git
! [rejected] topx -> topx (non-fast-forward)
error: failed to push some refs to 'git@heroku.com:myproject.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'Note about
fast-forwards' section of 'git push --help' for details.
