Skip to content

Instantly share code, notes, and snippets.

@mattray
Created December 22, 2010 17:20
Show Gist options
  • Save mattray/751789 to your computer and use it in GitHub Desktop.
Save mattray/751789 to your computer and use it in GitHub Desktop.
git status
# On branch master
nothing to commit (working directory clean)
mray@morbo[11:19](master)[] ~/Opscode/pbi-tse/pbis/Conferences
$ git push origin master
To git@github.com:mattray/pbi-tse.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:mattray/pbi-tse.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment