Optimizing Git Branching Strategy

Hey everyone,

We're running into some challenges with our current Git workflow for a medium-sized SaaS project, and I'm looking for some expert insights.

• Current Setup: We've been loosely following a Gitflow-like model, but with increasing team size (15+ devs) and multiple concurrent feature streams, our develop branch is becoming a bottleneck. Merges are frequent, and integration issues pop up constantly, especially with hotfixes needing to go into production while other features are still in development.
• Specific Problem: We're struggling to efficiently manage long-running feature branches alongside stable releases and urgent hotfixes. The rebase vs. merge debate is constant, and our CI/CD pipeline often gets clogged due to unstable develop. I'm particularly interested in strategies for environments where features might need to be deployed to staging for UAT for extended periods before going live, without blocking other features.
• Seeking Advice On:
  • Alternative branching strategies that scale better than strict Gitflow for continuous delivery.
  • Best practices for handling hotfixes and releases with minimal disruption to ongoing feature development.
  • Techniques for managing feature flags or trunk-based development in a multi-team environment to avoid merge hell.
  • Any tools or methodologies that help visualize or enforce a cleaner Git history.

Help a brother out please...