'non-fast forward error after rollback and rebase
What I am trying to do : Rolling back branch1 to some previous commit and then rebasing it on top of master branch.
There are two branches say branch1 and master. I rolled back branch1 to some previous commit using reset --hard.
After that I rebased branch1 on top of master. After resolving the conflicts, when I try to push, it gives non-fast forward error.
I tried git push -f -u origin branch1, git push +branch1 but none of them worked. How to successfully push in this case ?
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|