Should hotfixes be condsidered as part of Release versions?

[Ryan Potts]

Allow me to try to clarify. Since Release/1.2 was merged back to master hotfix/1.2.1 has been growing rapidly ( ). Should I consider hotfix/1.2.1 as Release code or should I really only be concerned with it if I come across issues in Release/1.2 that have been addressed in hotfix/1.2.1 (obviously yes I should). At some point (and when) will the hotfixes be rolled into the Release? Should I expect at some point it will just become 1.3 or will these hotfixes be pushed back to master as 1.2.1?

[Stefan Glienke]

This explains our branching model: http://nvie.com/posts/a-successful-git-branching-model/

Oh, and please follow this:

[Ryan Potts]

Thanks for pointing me to the explanation of your branching model, and to the Spring4D G+ group.