Standard git flow with support for minor branches