[Paraview-developers] [EXTERNAL] Re: Dashboard question

[Biddiscombe, John A.]

Ken

No. You are right. It's true that seeing all the small steps on the way to progress is useful. I do like rebasing when some of those small steps are just wrong and I want to replace them with the a correct step which is more sensible.

[I make a lot of temporary commits from the office PC to the laptop, to the cluster, just as a way of doing backups really so as I move around I can continue where I left off, and I don't want this crap to make it into a final version that joe public is using]. I just won't treat kitware/next as a normal branch. Only finished stuff should be ending up there anyway, but my first push was yesterday and somehow I still managed to munge it up despite all my careful preparation.

PPS. One solution to crazy ass coding and git blame is to document the stuff as you write it with handy comments explaining why you did this or that (controversial indeed)

JB

-----Original Message-----
From: Moreland, Kenneth [mailto:kmorel at sandia.gov] 
Sent: 02 March 2012 16:26
To: Biddiscombe, John A.; Kyle Lutz
Cc: paraview-developers at paraview.org
Subject: Re: [EXTERNAL] Re: [Paraview-developers] Dashboard question

SUCCESS! Rebasing gives huge monolithic commits with overly-simple explanations that explain nothing after you're dead and gone.  Topic branches collect your hundreds of commits into a narrative describing all the challenges you faced and design decisions you implemented.  I love having lots of commits so when I go back and say "why did I write that crazy-ass piece of code?" I can do a git blame and find the commit describing the obscure but important corner case said code correctly handles.


Perhaps we can just agree to disagree =]

-Ken

On 3/2/12 8:13 AM, "Biddiscombe, John A." <biddisco at cscs.ch> wrote:

>PS. Ken. FAIL! Rebasing is very sexy and I like it lots. I can take 
>months of rubbish coding and turn it into a nice clean commit with a 
>simple explanation instead of hundreds of hard to unravel mini-mistakes.
>After I'm dead and gone, people with truly think that I never made any 
>coding mistakes :)