logoalt Hacker News

tremontoday at 1:58 PM0 repliesview on HN

Exactly. As soon as you're working with multiple active releases, the branching model becomes a distinction without a difference. You will always be working with multiple (tagged) release branches, a default branch on which developers base their new work, and an integration branch where development work is gathered and tested to cut the next release. Whether the default and integration branch are identical or separate is mostly immaterial to the developer workflow.

The only meaningfully different model is when you have a continuously-releasable trunk and never do fixes on older releases (quite common for internal tools).