Git: pushing amended commits

Question

I am currently working on a project and using machines in two different locations to do it. I have created a branch for the feature I am working on and when I finish some work on it I amend my commit to that branch and push it to the server so I can pick up where I left off on my other machine. When I try to send my amended commit it rejects my push. I assume this is because I am pushing up a commit that is intended to clobber the current HEAD of the feature branch. I typically just use --force. Is there a better way to do this? ``` 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 cre…

Accepted Answer

There is no way to overwrite remote branch without --force in this case. You have 2 options:

- continue to use `git push --force`

- don't use `--amend`. If some work you've done deserves a separate commit (is stable enough, compiling, passing more tests, etc...), create new commit. If not, create temporary branch (something like `my-feature-unstable` if your branch is `my-feature`) and commit there. When it becomes stable again, you can do `git reset --soft my-feature`, `checkout my-feature` and `commit` to create single commit in your branch from several unfinished commits. After that, temporary branch can be deleted.

Git: pushing amended commits

Solution

Problem