Re: [Lilypond-auto] Staging/Master Merge - James' Patchy

[address@hidden]

On 7 mai 2012, at 19:54, James wrote:

> Hello,
> 
> On 7 May 2012 18:21, address@hidden <address@hidden> wrote:
>> On 7 mai 2012, at 19:17, address@hidden wrote:
>> 
>>> Begin LilyPond compile, commit: 9f408c3d2cfe0e3bbe0a683ff52422bd784459b8
>>> 
>>> *** FAILED STEP ***
>>> 
>>>       merge from staging
>>> 
>>>       maybe somebody pushed a commit directly to master?
>>> 
>>> 
>> 
>> Crap that might have been me with d877b9c284c88f91a7ae03f259d6e9f57787af90.  
>> I'm very sorry.  Could someone please verify and, if so, revert.
>> 
> 
> No. It was me. If I kill patchy while she is running she borks like
> this. I accidentally ran the script and killed it without thinking.
> Anyway, I;ve rerun her now and she has merged master.
> 
> No problems.
> 

Patchy, according to Graham, is a he, not a she.

Cheers,
MS