This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: git pull --rebase problems.
- From: Andrew Pinski <pinskia at gmail dot com>
- To: "Carlos O'Donell" <carlos at systemhalted dot org>
- Cc: "H.J. Lu" <hjl dot tools at gmail dot com>, GNU C Library <libc-alpha at sourceware dot org>
- Date: Wed, 3 Oct 2012 16:06:57 -0700
- Subject: Re: git pull --rebase problems.
- References: <CAE2sS1iK+XfK+BMAub2TRrz7ZBGszhH2uBCCA51Sjm+ep87a0Q@mail.gmail.com>
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
>
> Cheers,
> Carlos.