I had a similar issue and solution was to do a get fetch. After that I was able to do a git push too.