This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: git pull --rebase problems.
- From: Andreas Schwab <schwab at linux-m68k dot org>
- 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: Fri, 05 Oct 2012 12:38:43 +0200
- Subject: Re: git pull --rebase problems.
- References: <CAE2sS1iK+XfK+BMAub2TRrz7ZBGszhH2uBCCA51Sjm+ep87a0Q@mail.gmail.com>
"Carlos O'Donell" <carlos@systemhalted.org> writes:
> 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?
git even gave you the right hint.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."