hello, On 16 April 2012 08:07, David Kastrup <d...@gnu.org> wrote: > lilypond.patchy.jl...@gmail.com writes: > >> Begin LilyPond compile, commit: f1defa51a982cf769172cfcdd6b2612608ba2746 >> >> *** FAILED STEP *** >> >> merge from staging >> >> maybe somebody pushed a commit directly to master? >> >> Begin LilyPond compile, commit: >> f1defa51a982cf769172cfcdd6b2612608ba2746 >> >> *** FAILED STEP *** >> >> merge from staging >> >> maybe somebody pushed a commit directly to master? >> >> Begin LilyPond compile, commit: >> f1defa51a982cf769172cfcdd6b2612608ba2746 >> >> *** FAILED STEP *** >> >> merge from staging >> >> maybe somebody pushed a commit directly to master? > > Both master and staging are fine and at > f1defa51a982cf769172cfcdd6b2612608ba2746. I don't know how you managed > (disk quota exceeded? unclean shutdown?) but I would think that the > problem might be the bad repository I seem to remember you reported. > > Try > > git fsck > > or so.
No - but I appreciate the suggestions - it's something else I forgot to do WRT, editing my .git/config, configuring ssh etc. There are always a few things I forget to do when I clear out my dev env and 'start again'. I'll look at the CG when I have a few minutes and put some more detail in the 'setting up patchy' section - if only for myself and the noise I cause on the lists when I start again each time. James _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
