How to solve the issue of breaking the build without short lived branches (and pull requests) in TBD?

[removed]