Re: Bad translation merge

[David Kastrup]

David Kastrup <address@hidden> writes:

> Francisco Vila <address@hidden> writes:
>
>> I rebased by mistake (instead of merging) lilypond/translation into
>> staging and my reasoning was: provided that staging does 'make &&
>> make doc' and it has all the new work from translations, staging is
>> not damaged in any way, for now.

Except that the work of the last few weeks in master may be gone.
master compiled a few weeks ago just fine, so compiling is a poor test
for integrity.

Anyway, when in doubt, don't reason.  Just make sure that you are in the
branch you started with 15 minutes ago, then do

git reset --hard "address@hidden minutes ago}"

and then do it the stupid way.  Yes, you can tell git literally to go
back to what HEAD was 15 minutes ago.

-- 
David Kastrup