[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Bad translation merge

From: David Kastrup
Subject: Re: Bad translation merge
Date: Wed, 07 Mar 2012 23:05:27 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux)

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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]