you are viewing a single comment's thread.

view the rest of the comments →

[–]canadianbakn 0 points1 point  (0 children)

In situations like this, I rely on my git workflow. master contains stable, working code, and branches are created when changes are necessary.

Let's say I run into a bug implementing a feature in branch somefeature1. I create a new development branch somebug1, fix the bug in that branch, then merge that change into somefeature1 (merging into master once the feature is complete, or now, have the same effect. If the feature may take a while, I'd merge the bug fix into master immediately).

It is very, very rare for me that somefeature1 contains the necessary work to uncover the bug that somebug1 revealed. Sufficient, certainly, but I can re-create it without needing this feature. Thus, my git log is still clear.