This somewhat depends on how big your features are. Arguably, large long-lived feature branches are the problem themselves. If larger features are broken down a

This somewhat depends on how big your features are. Arguably, large long-lived feature branches are the problem themselves. If larger features are broken down and developed/merged piecemeal, then you still have smaller commits you can fall back on. IIRC, GitHub uses a development model where partially implemented features are actually deployed to production, but hidden behind feature flags.