I don't merge it in master in feature, because a merge request is created after that for this branch, so this action is doing by another team member as example.Īnd I'm absolutely sure that noone commit in my branch and works with my branch, so as I understand force push is acceptable. git push origin new_feature -f - I'm able to push it only with force because the history is different in current and remote feature branch.if master branch has changes we'll get rebased history of commits in current state.git pull -rebase origin master - because I don't want to have intermediate merge commit.We have master, I need to add some feature, so:.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.Is it ok when I do rebase and force push in branch which is used only by me? And will I have a problem after merge this branch in master later? So git push -force origin feature-branch simply overrides origin/feature-branch with local feature-branch. 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.Īnd what -force option does is just ignoring state of remote branch and setting it to the commit you're pushing into it. In that situation remote branch can't be fast-forwarded to local. That means after rebase you have something like that: A-B-C-F-G-D'-E' <- feature-branch When you perform git rebase commits D and E are applied to new base and new commits are created. 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) This feature branch is not shared with any other devs, so I have no problem de facto with the force push, I'm not going to lose any data, the question is more conceptual. So, do I need it? Does the rebasing necessarily imply that the next push should be -forceful? Note: git push -force - and even -force-with-lease for that matter - can be a dangerous command because it rewrites the history of the branch.

I hate using -force without being sure I need it. This can only be solved with git push -force origin feature. Problem: the moment I want to backup the new rebased feature branched with git push origin feature, the push is rejected since the tree has changed due to the rebasing. Up until now, we're good.īut now I want to rebase feature on top of the F-G commits on master, so I git checkout feature and git rebase master. I have no problem to git push origin master to keep the remote master updated, nor with git push origin feature (when on feature) to maintain a remote backup for my feature work. I end up with something like this (lexicographic order implies the order of commits): A-B-C-F-G (master) I do some work on master, some on feature, and then some more on master. I have a master branch and a feature branch. OK, I thought this was a simple git scenario, what am I missing?

Git rebase force push