Mailing List Archive


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

Re: [tlug] Chrome ate my profile



On 2018-03-19 17:13 +0900 (Mon), Stephen J. Turnbull wrote:

> I don't understand how it can be easier than save, fix, save (look ma,
> no explicit git here!)
> ...
> Sounds exactly like what I do have except that I never need to invoke
> git explicitly for this functionality, and it's never on a branch that
> I might push.

I don't see how overall that's easier because you still need to turn
these "saved" things (wherever you're saving them) into commits at
some point and distribute those back out to the other developers. With
Git you just commit small bits of work on whatever in any order at
all, and then it's merely a matter of reordering and combining them
from time to time to produce easy-to-consume units of commit that can
go out at their different times without trouble.

I don't know how clear that and my previous answer were, but perhaps a
more specific example will help. Over the course of developing a
feature I might end up with the following commits over the course of a
day.

    1. Started implementation of my new feature (new tests and code).
    2. Realized that a section of a file  file needed reorganization,
       so did that. (This leaves commit 1 as a nowhere near complete
       start on the feature that nobody wants to see.)
    3. Back to more feature implementation.
    4. Realize that the whole file I'd touched above needs
       reorganization, and a few things moved between this and other
       files.
    5. Barely get started on yet more feature.
    6. Refactoring of stuff that's been causing me mild pain since
       step 1.
    7. Now I get some real work done on the feature, though still not
       done.

At the end of the day, I'll probably take commits 2 and 4, squash them
together, put them at the top, and roll them out to master. 6. Will
get moved to just after that but not go out to master yet because I'm
not totally sure it's the correct refactoring, but will probably get
released before my feature does. 1, 3, 5 and 7 will all be moved to
the end and likely squashed together.

I don't really see how you'd do something like this with just saving
and moving files around. I used to do it in a rather less convenient
way in Subversion by using multiple checkouts.

cjs
-- 
Curt J. Sampson      <cjs@example.com>      +81 90 7737 2974

To iterate is human, to recurse divine.
    - L Peter Deutsch


Home | Main Index | Thread Index

Home Page Mailing List Linux and Japan TLUG Members Links