Hmmm.
I spoke too soon. It seems that your advice did not really help:(
I did a git log and found this merge:
commit 5f052c9b72f5f6306ee3702c66b6de701e36b06f
Merge: 8100265 f645170
Author: ...
Date: Wed Oct 17 12:50:38 2012 -0400
Merge remote-tracking branch 'gerrit/master' into nov2012
Conflicts:
.../PrefilterManagerImpl.java
.../InternalPresenter.java
.../adverterContext.xml
.../ExternalXmlPresenterTest.java
.../daoImplContext.xml
Change-Id: Ic14a5c05b2b45aaf1f87fb235f720050d9a749dd
This is very confusing, since none of the conflicts were changed in the
local commit.
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:
>
> Excellent!
>
> Thank you!
>
> Must have misread the help.
>
> On Wednesday, October 17, 2012 2:26:06 PM UTC-4, Alexandru Pătrănescu
> wrote:
>>
>> check the pull command help!
>>
>> you could run:
>>
>> git fetch origin
>> git rebase remotes/origin/nov2012
>>
>>
>> or
>>
>> 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
>>> master
>>> * nov2012
>>> remotes/gerrit/master
>>> remotes/origin/HEAD -> origin/master
>>> remotes/origin/master
>>> remotes/origin/nov2012
>>> remotes/origin/test
>>> remotes/origin/test-branch
>>> $ 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
>>> https://groups.google.com/d/msg/git-users/-/EmcdHzCcrPAJ.
>>> To post to this group, send email to git-...@googlegroups.com.
>>> To unsubscribe from this group, send email to
>>> git-users+...@googlegroups.com.
>>> For more options, visit this group at
>>> http://groups.google.com/group/git-users?hl=en.
>>>
>>
>>
--
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/-/H5ROyt3GoQUJ.
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.
