RE: Patchy email

[Carl Sorensen]

________________________________________
> From: address@hidden [lilypond-devel-
> address@hidden on behalf of address@hidden 
> address@hidden
> Sent: Friday, December 30, 2011 5:21 PM
> To: address@hidden
> Cc: address@hidden
> Subject: Patchy email
>
> Begin LilyPond compile, commit: 2f25894efd8ad242b233d5a1d07afcfa087ebab2
> 
> *** FAILED STEP ***
> 
>         merge from staging
> 
>         maybe somebody pushed a commit directly to master?

Francisco merged translation with staging, and apparently also with master. 
(The commit message says merge with staging, but the commit is on master and is 
the parent of staging.

I suspect that we have not yet worked out the right way to deal with 
translations, and I don't know enough git to know what to recommend.

David, any ideas?

Thanks,

Carl