I give up! Whenever I try to push I get a stupid:
! [rejected] master -> master (non-fast forward) error: failed to push some refs to \'git@github
Actually I got the same error but the below comment worked for me
git push -f origin master