3 ms·
I have found squashing useful for merging a bug fix branch. Half of a bug fix does nobody any good.
by mnemonik 17y ago
I have found squashing useful for merging a bug fix branch. Half of a bug fix does nobody any good.
- rue 17y agoYou could squash parts of a single bugfix, sure, if you end up with multiple commits. Still, though, I would leave the spec you wrote (you write tests or specs for bugs you find, right? Right?:) in a separate commit - in case you for example need to revert the fix at some point, or someone else just wants to cherry-pick the spec.