What worked for us was actually rebasing, and having one person orchestrating the merges. That way you can have 10+ feature branches and only when you are ready to merge you rebase and check everything is working fine.