Thanks a lot for this answer. Good point about keeping the branches small and about having only two.
The team I work on is quite small, so I can see how not using branches can work. I've worked on larger teams and I can't imagine how we would have managed those changes without an excellent branching model (git-flow).