I've tried branch-per-environment but it has proven difficult to adopt across a large team.