Use Git-Flow to manage Branches about scenarioo HOT 6 CLOSED

Unbedingt! Sobald mer branches bruche. Bruchemer scho?

On 11.07.2013, at 23:00, forkch [email protected] wrote:

see http://nvie.com/posts/a-successful-git-branching-model/

—
Reply to this email directly or view it on GitHub.

from scenarioo.

Since we have a live demo, which should run as stable as possible, we should start discussing a suitable release and branching strategy.

I suggest we discuss this at the next monthly meeting:

• What is our release strategy? How often do we want to release?
• What git branching (or fork and pull request mode) strategy do we want to use in the future?

from scenarioo.

Yeah, we should really discuss this at the next monthly meeting. Git-Flow looks reasonable to me. Just started reading about it.

from scenarioo.

We should already start creating releases (e.g. 0.1) so that users of the app have a well defined version and know what they have to expect when upgrading to a newer release (by reading the release notes). We could define some rules about the versioning too, like e.g.:

• First number for major releases (usually comming with breaking changes, they might require migration scripts to migrate old documentation data).
• Second number for minor releases (new features, but no breaking changes)
• Third number for bugfixes (only fixes, no new features and no breaking changes)

Does that sound reasonable? Do you have other ideas?

from scenarioo.

As discussion today we start to use git flow as branching strategy (see
https://github.com/scenarioo/scenarioo/wiki/Branching-and-Release-Strategy)

Introduced new main development branch 'develop'. As of now DO NOT commit anything (apart from a new release) the the 'master' branch.

from scenarioo.

on the CI both (master and develop) branches are built but as of now only the 'develop' branch gets deployed on the local tomcat. I will look into deploying also the 'master' branch i.e. the current stable release

from scenarioo.