Mike Andrew Mike Andrew - 1 year ago 81
Git Question

Git push branch error after pull rebase

step 1.

git pull --rebase

step 2:
git push origin my_branch

I get push failed error. If I push branch after removing remote branch then no error.

Question, how to push branch after pull rebase?


Answer Source

Rebasing a branch in Git may involve rewriting the history of that branch, assuming that the bases of the two branches were different. From what you told us, it seems that you rebased on a different branch. Most likely, in your case, your my_branch was rewritten, which means you cannot simply push to the remote.

To get around this, you can force push your branch via:

git push --force origin my_branch

However, you might not want to do this if the rebase on a different branch were unintentional.

Instead, try rebasing this way:

git pull --rebase origin my_branch
# resolve merge conflicts, if any
git push origin my_branch

General warning:

Force pushing a public shared branch is usually a bad idea, because it causes problems for everyone who shares that branch. If your current workflow involves doing this, you might want to reconsider.

Recommended from our users: Dynamic Network Monitoring from WhatsUp Gold from IPSwitch. Free Download