Re: Staging/Master Merge - James' Patchy

[David Kastrup]

address@hidden 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.

-- 
David Kastrup