Hacker News new | ask | show | jobs
by MBCook 4654 days ago
A Successful Git Branching Model [1] is a very common way to deal development in a good sized project. You could consider the bug fixes to v1, v2, and v3 to be hot fixes. You could choose to keep a single running branch (the equivalent of master in the model given) for each of the older versions if you keep adding occasional features.

I know I've seen guides online of how to deal with the exact problem you're describing, but I can't remember where to find any of them right now.

[1] http://nvie.com/posts/a-successful-git-branching-model/