git-style-guide
git-style-guide copied to clipboard
Git rebase not working as expected (Label:Question)
Hello have doubt regarding git rebase .
I have two branches one main and another my feature branch .
I made 3 commit on feature branch at 1pm 2pm and 3pm respectively, now I did the 4th commit on main-dev at 4pm , When I am on feature branch and running git rebase main , on top of 4th commit my 3 commits are there absolutely as expected , but here comes the problem as soon as I am running git push my feature branch is getting diverged and then getting merged into feature again .
Can you help here , why it is happening.
Below screenshot for reference