[jstx1]

Have short-lived branches for whatever change you're making, merge into main, repeat.

Is there a problem with this? Seems too obvious to even call it a strategy.

[matart]

This is how I have done it at multiple companies. Anything else has always felt too complicated.