Hey guys,

I have tried to pull from 3 separate committers - succeeded in one
case, and failed (with 2 separate problems) in the other two. Here are
the problems:

(on a clean clone, just to be sure):

Macintosh-4:scrubyt mbp$ git remote add -f jspradlin
git://github.com/jspradlin/scrubyt.git
Updating jspradlin
remote: Counting objects: 23, done.
remote: Compressing objects: 100% (18/18), done.
remote: Total 18 (delta 9), reused 0 (delta 0)
Unpacking objects: 100% (18/18), done.
>From git://github.com/jspradlin/scrubyt
 * [new branch]      master     -> jspradlin/master
 * [new branch]      skimr      -> jspradlin/skimr
Macintosh-4:scrubyt mbp$ git checkout -b jspradlin/master
M       CHANGELOG
Switched to a new branch "jspradlin/master"
Macintosh-4:scrubyt mbp$ git pull jspradlin master:master
>From git://github.com/jspradlin/scrubyt
 ! [rejected]        master     -> master  (non fast forward)
Macintosh-4:scrubyt mbp$ git checkout master
M       CHANGELOG
Switched to branch "master"
Macintosh-4:scrubyt mbp$ git merge jspradlin/master
warning: refname 'jspradlin/master' is ambiguous.
warning: refname 'jspradlin/master' is ambiguous.
Already up-to-date.

[and the changes are not pulled]
and the other:

Macintosh-4:scrubyt mbp$ git remote add -f mikkel 
git://github.com/mikkel/scrubyt.git
Updating mikkel
remote: Counting objects: 33, done.
remote: Compressing objects: 100% (18/18), done.
remote: Total 19 (delta 9), reused 0 (delta 0)
Unpacking objects: 100% (19/19), done.
>From git://github.com/mikkel/scrubyt
 * [new branch]      master     -> mikkel/master
 * [new branch]      skimr      -> mikkel/skimr
Macintosh-4:scrubyt mbp$ git checkout -b mikkel/master
Switched to a new branch "mikkel/master"
Macintosh-4:scrubyt mbp$ git pull mikkel master:master
>From git://github.com/mikkel/scrubyt
 ! [rejected]        master     -> master  (non fast forward)

Halp! I have no clue what's is going on.

Cheers,
Peter
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"GitHub" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/github?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to