I spoke too soon. It seems that your advice did not really help:(
I did a git log and found this merge:
Merge: 8100265 f645170
Date: Wed Oct 17 12:50:38 2012 -0400
Merge remote-tracking branch 'gerrit/master' into nov2012
This is very confusing, since none of the conflicts were changed in the
Second, I was NOT trying to merge gerrit/master into nov2012, but rather
remotes/origin/nov2012 (the branch that the current branch was cloned from).
Thanks again for any further help!!!
On Wednesday, October 17, 2012 2:42:29 PM UTC-4, kramer.newsreader wrote:
> Thank you!
> Must have misread the help.
> On Wednesday, October 17, 2012 2:26:06 PM UTC-4, Alexandru Pătrănescu
>> check the pull command help!
>> you could run:
>> git fetch origin
>> git rebase remotes/origin/nov2012
>> git pull --rebase origin nov2012
>> On Wed, Oct 17, 2012 at 9:12 PM, kramer.newsreader <kramer.n...@gmail.com
>> > wrote:
>>> Hi guys,
>>> FYI Git n00b here.
>>> I am having trouble pulling from a remote branch. I'm not really sure
>>> what's going on. I didn't have any problem with this yesterday. I can
>>> manually log in to the remote server (gerrit).
>>> See the commands below:
>>> $ git branch -a
>>> * nov2012
>>> remotes/origin/HEAD -> origin/master
>>> $ git pull --rebase remotes/origin/nov2012
>>> fatal: 'remotes/origin/nov2012' does not appear to be a git repository
>>> fatal: The remote end hung up unexpectedly
>>> Thanks much for the help guys!!!
>>> 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
>>> To post to this group, send email to git-...@googlegroups.com.
>>> To unsubscribe from this group, send email to
>>> For more options, visit this group at
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
To post to this group, send email to email@example.com.
To unsubscribe from this group, send email to
For more options, visit this group at