git pull --rebase problems.

Carlos O'Donell carlos@systemhalted.org
Wed Oct 3 22:51:00 GMT 2012


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.



More information about the Libc-alpha mailing list