A pragmatic middle ground is learning fixup and autosquash and making the story mode before merging the code.

Your story mode == commit mode provided you can divide at a good enough granularity. This is generally not a problem though.