A more general approach to this is something like https://bors.tech/ https://bors.tech/ where each merge is explicitly tested before hitting the main branch. Br

A more general approach to this is something like https://bors.tech/ https://bors.tech/ where each merge is explicitly tested before hitting the main branch. Branches then don't need to be manually rebased, but there's still much reduced risk of failures due to not merging (if tests aren't even run on the potential merge commit), or "merge skew" (if they are, but not every time the target branch is updated, like Travis CI, etc., do by default).