bpsm / edn-java

a reader for extensible data notation
Eclipse Public License 1.0
100 stars 24 forks source link

Switch branching strategy to "git-flow" #29

Closed bpsm closed 11 years ago

bpsm commented 11 years ago

I intend to switch the branching model of edn-java git-flow.

This entails:

The git-flow model strikes me as a clean way to manage branches.

It has the advantage, on git hub, that the branch users see by default 'master' will show them the README of most recent stable release.

One potential drawback is that there's a monotonicity to putting all releases on master.

Consider this hypothetical: we release 2.0.0 but need to continue maintenance of 1.1.x, for some time because it takes users a while to upgrade to 2.0.0. Git-flow doesn't make explicit allowances for this, but it seems it could be addressed by branching "master-1.1.x" from the last 1.1.x tag and treating it like a second "master" branch.

I don't consider it likely that I'll need to maintain two production versions of edn-java in parallel at this stage in its life cycle (or really, ever), so I think this potential drawback is acceptable.

bpsm commented 11 years ago

'master' is now at 0.4.0 'develop' is created and builds as 'develop-SNAPSHOT'