[kwlug-disc] Advanced(?) Git usage question

[John Johnson]

On 2014-04-09 15:44, Adam Glauser wrote:
> It seems like an awful lot of work for a very minor bugfix, ...

IMO For the administration angle, The "awful lot of work" has no 
relation to the complexity or the severity of the bugfix. It is an evil, 
maybe even a necessary evil from a 'best practices' point of view.

Having said the above, an alternate approach would be to take a branch 
now of the release candidate, fix the bug in that branch and migrate the 
patch back to the mater and the feature branch. What I call the "rewind" 
approach, i.e. rewinding to the commit before A, lets call it commit 
A-1, is a valid approach, but you may have to migrate many more changes 
made since A-1, A and B, etc. back to that branch.

IMO Focusing on only the current bug and its bugfix is less risky.

FWIW: This is from a Git newbie, having just started with Git, working 
with two local repositories one of which is branched as a result of a 
"rewind".

JohnJ

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://kwlug.org/pipermail/kwlug-disc_kwlug.org/attachments/20140409/9476ee5d/attachment.htm>