Sent: Saturday, May 06, 2017 12:51 PM
Subject: Re: [git-users] How to get a highly complex branch straight?
<snip>
The benefit of Mikado's "always rollback" approach is that you can continue
making fixes/updates/improvements.
Always rolling back means you always start from scratch. "Taking a note" is
no solution. It's just a note.
NB: Do not assume that "you don't need to document". Large projects,
multiple people, long time (enough to forget something), all add up to
"Document, document, document".
I conflicts appear during a step-rebase, one can write notes right into the
commit message.
--
It's good to hear that the 'rebase' solution has worked.
If I could just correct one possible misunderstanding about the mikado method
suggested above regarding the perceived "always rollback".
The rollback is only in the case where the attempt at making progress has
failed and the user is stuck. (the usual situation is to have made many changes
and still be at the 'just one more change' and that is it 'solved' stage,
repeated for days and weeks).
By acknowledging that one has hit a problem, noting it, and returning to
working code, the user can maintain 'working code' (assuming that is a goal!)
during the big-fix (which is the way it was in days gone by). (it is obvious
way of doing the fix in retrospect, the tooling just needs to support it)
At a slightly higher level, the choosing of which sub-branches to rebase (and
discovering which have merge conflicts that are too hard to resolve just now
and aborting), is an embodiment of the general method of 'divide & conquer;
keep the code working'.
regards
Philip
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
