Can't push staging to master

[Phil Holmes]

I tried running lilypond-patchy-staging.py early this morning while I had my 
breakfast.  When I looked at the terminal it just said "Stopped" - there was 
no CPU or disk activity and the logfile said:

Begin LilyPond compile, commit: 6ec4177a4076c45e00e904fd6457dcf57130119d
Merged staging, now at: 10af9324c6d94453857e10951c4f58043e9a9f11
Success:  ./autogen.sh --noconfigure
Success:  ../configure --disable-optimising

I had to get off to college, so Ctrl-Z and hibernate.  Tried again just now 
and got a message saying 'test-master-lock' already exists, and it deleted 
it. It now won't merge.  The logfile shows:

Begin LilyPond compile, commit: 6ec4177a4076c45e00e904fd6457dcf57130119d
*** FAILED STEP ***
merge from staging
maybe somebody pushed a commit directly to master?
Begin LilyPond compile, commit: 6ec4177a4076c45e00e904fd6457dcf57130119d
Merged staging, now at: 3fa8dfbe7c4d70010f5182f3c684f241762d9ec9
Success:  ./autogen.sh --noconfigure
Success:  ../configure --disable-optimising
Begin LilyPond compile, commit: 6ec4177a4076c45e00e904fd6457dcf57130119d
*** FAILED STEP ***
merge from staging
maybe somebody pushed a commit directly to master?

Help with this gratefully received.

--
Phil Holmes