> Avoid Feature Branches

This is a big one. It seems the industry (at least to my awareness) has almost totally rejected Gitflow for trunk based development in the last few years. It’s a beautiful idea in theory, but a complete headache in reality.

> Use feature flags

Be careful here. Adding feaure flags means you now effectively have N^N builds (where N is the number of flags) in production, each with their own possible quirks and integration issues. Keep them to an absolute minimum, and remove them as soon as possible.