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
If nothing works, try:
git pull --allow-unrelated-histories
then do:
git push --set-upstream origin master