The model described in this article is a very reasonable one. I've been using something quite similar with various teams at different software companies over th

The model described in this article is a very reasonable one. I've been using something quite similar with various teams at different software companies over the last years and it has always worked great. Little form, lots of function. One note, though — feature branches should IMO be short-lived. Long-lived branches cause huge and difficult merges and rapidly start being costly to maintain.