Git push rejected after feature branch rebase

by

The problem is that git push assumes that remote branch can be fast-forwarded to your local branch, that is that all the difference between local and remote branches is in local having some new commits at the end like that:

Z--X--R         <- origin/some-branch (can be fast-forwarded to Y commit)
       \        
        T--Y    <- some-branch

When you perform git rebase commits D and E are applied to new base and new commits are created. That means after rebase you have something like that:

A--B--C------F--G--D'--E'   <- feature-branch
       \  
        D--E                <- origin/feature-branch

In that situation remote branch can’t be fast-forwarded to local. Though, theoretically local branch can be merged into remote (obviously you don’t need it in that case), but as git push performs only fast-forward merges it throws and error.

And what --force option does is just ignoring state of remote branch and setting it to the commit you’re pushing into it. So git push --force origin feature-branch simply overrides origin/feature-branch with local feature-branch.

In my opinion, rebasing feature branches on master and force-pushing them back to remote repository is OK as long as you’re the only one who works on that branch.

More Related Contents:

  1. Why do I need to do `–set-upstream` all the time?
  2. Git push existing repo to a new and different remote repo server?
  3. How to read the output from git diff?
  4. How to use git bisect?
  5. How do I tell Git to ignore everything except a subdirectory?
  6. Using Git, show all commits that are in one branch, but not the other(s)
  7. How to get the changes on a branch in Git
  8. Git branching: master vs. origin/master vs. remotes/origin/master
  9. Creating SSH keys for Gerrit and Hudson
  10. How does git commit –amend work, exactly?
  11. Detach many subdirectories into a new, separate Git repository
  12. Git push results in fatal: protocol error: bad line length character: This
  13. Git Diff with Beyond Compare
  14. Change old commit message using `git rebase`
  15. How to get changes from another branch
  16. Google Cloud: How to deploy mirrored Repository
  17. What is the difference between git pull and git fetch + git rebase?
  18. Upgrading git from the source repository in Ubuntu
  19. Remove old git commits
  20. Why doesn’t git recognize that my file has been changed, therefore git add not working
  21. How to keep a branch synchronized/updated with master?
  22. Synchronizing a local Git repository with a remote one
  23. update package.json version automatically
  24. Different default remote (tracking branch) for git pull and git push
  25. git command to show all (lightweight) tags creation dates
  26. Duplicate submodules with Git
  27. Is there anyway to undo git push -f?
  28. How to improve git log performance?
  29. Why does zsh kills my process every time I enter a git command
  30. Git – Ignoring a specific modification to a config file

Leave a Comment