I simply don't understand:

  $ git pull upstream master 
  From github.com:benbjohnson/smeagol
   * branch            master     -> FETCH_HEAD
  Already up-to-date.

  $ git push upstream master 
  To git(at)github.com:benbjohnson/smeagol.git
   ! [rejected]        master -> master (non-fast-forward)
  error: failed to push some refs to 
'git(at)github.com:benbjohnson/smeagol.git'
  To prevent you from losing history, non-fast-forward updates were rejected
  Merge the remote changes before pushing again.  See the 'Note about
  fast-forwards' section of 'git push --help' for details.

(Note I had to put `(at)` in place of `@` b/c Google Groups is being 
retarded.)

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/jNtyUDktBjUJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to