----- Original Message ----- From: "David Kastrup" <d...@gnu.org>
To: "Phil Holmes" <m...@philholmes.net>
Cc: <lilypond-devel@gnu.org>
Sent: Monday, September 09, 2013 9:25 AM
Subject: Re: Patchy email


"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:11 AM
Subject: Re: Patchy email


David Kastrup <d...@gnu.org> writes:

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.

That would likely be

git branch -d -r origin/dev/janek
error: remote branch 'origin/dev/janek' not found

Then either your repository is fine, or its name for the central
upstream is not "origin" or the repository is different from the
repository actually having the problem (environment variables or command
line options?).

--
David Kastrup


OK - fixed now, thanks. Problem was finding where the git repo actually was on my patchy VM.

--
Phil Holmes

_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to