"Phil Holmes" <m...@philholmes.net> writes: > ----- Original Message ----- > From: "David Kastrup" <d...@gnu.org> > To: <lilypond-devel@gnu.org> > Sent: Monday, September 09, 2013 9:05 AM > Subject: Re: Patchy email > > >> philehol...@googlemail.com writes: >> >>> error: some local refs could not be updated; try running >>> 'git remote prune origin' to remove any old, conflicting branches >> >> Well, yes. Either do that, or look up how to prune just dev/janek. He >> first created this as a branch, then changed it to a branch directory. >> "git fetch" is not really happy with that. >> >> -- >> David Kastrup > > > As you see, I have had problems running patchy-staging. I had this > same problem yesterday with my normal development machine, but running > git remote prune origin' as suggested, fixed it. I can't seem to get > the same to work on my patchy VM.
Try git branch -d -r origin/dev/janek on your patchy VM. -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel