lmi
[Top][All Lists]
Advanced

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

Re: [lmi] Did I resolve this git issue correctly?


From: Greg Chicares
Subject: Re: [lmi] Did I resolve this git issue correctly?
Date: Thu, 15 Mar 2018 17:05:37 +0000
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0

On 2018-02-14 02:11, Vadim Zeitlin wrote:
[...]
>  I strongly advise you to do
> 
>       $ git config pull.ff only

I'd like to thank you again for that excellent advice.

I just tried autosquashing across a push to origin, and this setting
prevented that mistake from turning into an avalanche...so that I
could recover by fixing the fixup first, then cherry-picking all the
subsequent commits from the reflog.

The
    floor(3 +/- ε) != trunc(3 +/- ε) == static_cast<int>(3 +/- ε)
problem had already ruined my whole day, and I should have realized
that removing the call to floor might break the other invariant:
  [don't call floor]: trunc(3 +/- ε) != static_cast<int>(3 +/- ε)
                                     ^ !!!
The only good thing is that I didn't make it worse with a bad push,
so thanks again.



reply via email to

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