Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Rework the release process and branching structure #77
Currently, marshmallow uses a stripped-down version of git-flow, with a production branch (
After some consideration, I've decided that marshmallow's release process doesn't neatly fit into the git-flow model.
I sometimes create feature and support branches that get merged into
More importantly, Git-flow constrains you to have one release branch at a time. I am currently planning to support two release lines: 1.1 and 2.0 (once it is released), and I'm not sure how this would work with git-flow.
I propose the following changes to the branch structure:
I believe this structure to be simpler and more in line with marshmallow's release process.
Barring any objections to this change, I will update the contributing docs accordingly.