Git push failed, "Non-fast forward updates were rejected"

Git push failed, “Non-fast forward updates were rejected”

I've had the same problem.
The reason was, that my local branch had somehow lost the tracking to the remote counterpart.

After

git branch branch_name --set-upstream-to=origin/branch_name  git pull  

and resolving the merging conflicts, I was able to push.

Read full article from Git push failed, “Non-fast forward updates were rejected”