This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
git pull --rebase problems.
- From: "Carlos O'Donell" <carlos at systemhalted dot org>
- To: "H.J. Lu" <hjl dot tools at gmail dot com>, GNU C Library <libc-alpha at sourceware dot org>
- Date: Wed, 3 Oct 2012 18:51:33 -0400
- Subject: git pull --rebase problems.
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?
Cheers,
Carlos.