This happened to me once I tried to push from a new branch and I used git push origin master
instead.
You should either:
git push origin your_new_branch
if you want that this
branch occurs too in the remote repo.git merge origin master
.Recap: the point here is that you should check out where you offer on the second parameter for git merge. So if you are in the master use master as the second parameter if you are in the new_branch use this as the second parameter if you want to keep this branch in the remote repo else opt for the second option above instead.