This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: git pull --rebase problems.
On 10/3/2012 7:06 PM, Andrew Pinski wrote:
> On Wed, Oct 3, 2012 at 3:51 PM, Carlos O'Donell <carlos@systemhalted.org> wrote:
>> Team,
>>
>> What happened here?
>>
>> git pull --rebase
>> error: 'refs/remotes/origin/hjl/pr14557' exists; cannot create
>> 'refs/remotes/origin/hjl/pr14557/map'
>> From ssh://sourceware.org/git/glibc
>> ! [new branch] hjl/pr14557/map -> origin/hjl/pr14557/map
>> (unable to update local ref)
>> error: 'refs/remotes/origin/hjl/pr14557' exists; cannot create
>> 'refs/remotes/origin/hjl/pr14557/master'
>> ! [new branch] hjl/pr14557/master -> origin/hjl/pr14557/master
>> (unable to update local ref)
>> error: some local refs could not be updated; try running
>> 'git remote prune origin' to remove any old, conflicting branches
>>
>> Is there something I need to do on my end to fix this?
>>
>> Delete the local tracking branches and pull again?
>
> Just run "git remote prune origin" and it should work.
> I had to do this when I did a "git pull" recently.
Thanks Andrew, that worked.
What causes this to happen?
Deleting and recreating remote branches with the same names?
I don't like having to obey git without knowing what it's doing...
Cheers,
Carlos.