On Thu, 30 Apr 2015 07:09:22 -0500 "Edward K. Ream" <[email protected]> wrote:
> On Wed, Apr 29, 2015 at 11:24 AM, Kent Tenney <[email protected]> > wrote: > > > Well done. > > 1/2 hour, shows when and how to use some scarier git commands > > https://www.youtube.com/watch?v=4EOZvow1mk4 > > > > ​Thanks. There are several commands I've never used. > > Just to be clear, the upsetting thing about the recent reversion of > Terry's code was due solely to the fact that the reversion was not > obvious from the diffs in SourceTree. Not sure whether that is a > SourceTree problem or a git problem. It's git rather than SourceTree, although it might be you rather than git ;-) We started from 37dd5677 and both edited leoEditCommands.py, your changes committed in 294b358 and mine in 7d21d1a. 24906c45 is where you merged these, apparently keeping only your changes - I guess the issue is why didn't that cause enough alarm from git etc. to catch the problem. For the diff, well, there's not really any parent child pair in which your removal of my changes /could/ be seen. B / \ ->-A *--D--> \ / C A,B,C,D are commits, * is the merge process that happened before D if B is your 294b358 and C my 7d21d1a, my diffs only exist between A and C, not B and D or A and D. Whatever happened happened in * Cheers -Terry > In other words, I knew there was a problem, but that was because I > knew I had just screwed up. Afaik, there was no other way to know > that the reversion happened, so it might have lasted indefinitely. > > Sure, it's almost impossible to really lose data with git, but that > does no good unless you know that you have to recreate the data. And > how are you supposed to know that if the diffs don't show the > reversion? > > EKR > -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
