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
First, attempt to pull from the same refspec that you are trying to push to.
If this does not work, you can force a git push by using git push -f , but use caution: this method can cause references to be deleted on the remote repository.
git push
git push -f