We're adopting this model, with branches for each deployment https://trunkbaseddevelopment.com/