Git push rejected “non-fast-forward”

Question

I am fairly new to git yet currently using it to manage our code in a team environment. I had some rebasing issues and I fixed them using

git ch         


        

Answer 1

It looks, that someone pushed new commits between your last git fetch and git push. In this case you need to repeat your steps and rebase my_feature_branch one more time.

git fetch
git rebase feature/my_feature_branch
git push origin feature/my_feature_branch

After the git fetch I recommend to examine situation with gitk --all.