Re: Patchy email

[Francisco Vila]

2011/12/31 Carl Sorensen <address@hidden>:
>> 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?

I performed a single 'merge lilypond/translation' command while on staging.
Then I performed a single 'push origin staging' command.  I have not
touched master. I did not 'git checkout master'. I did not push
master. I did not mention master on my keyboard or in my thoughts.  I
have had nightmares about master in the past, but master is off my
life now.  Master does not exist for me anymore.

I suspect one way or another master and staging are the same thing,
which is not my fault.

-- 
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com