For longer running larger features I would use interactive rebasing to selectively squash the larger feature into several more bite sized commits that declare i

For longer running larger features I would use interactive rebasing to selectively squash the larger feature into several more bite sized commits that declare intent and then merge that