Basically, due to events beyond my control, my remote repo was moved - I did a lot of work on my local copy in the meantime and now I really just want to overwrite everythin
Been having the same problem. This command worked for me.
git push --set-upstream origin master --force