Your colleague’s approach is nice. The only warning would b e on losing meaningful grouping of work. For instance if you are doing a change in two clear steps

Your colleague’s approach is nice. The only warning would b e on losing meaningful grouping of work. For instance if you are doing a change in two clear steps (e.g creating a new module first, and switching existing behaviors to the new module in a second time), having separate commits helps for readability, but also if you end up needing to split your branches in two or more. In particular it makes a big difference if you happen to need to revert: you’ll probably get away with reverting one of the commits, instead of the whole feature.