Branching workflow

Jump to bottom Edit New page

Daniele Ricci edited this page Feb 20, 2015 · 17 revisions

TODO describe current branching model

master is the integration branch (i.e. next/develop/whatever)
features in feature/name
releases in release/major.minor updated with hotfixes
tagged releases
no need for a "stable" branch?

Other tips:

be sure to always merge back with --no-ff