Skip to content

BranchingRules

cwerling edited this page Sep 19, 2014 · 3 revisions

Branching Rules

  • Everybody can commit to default, if the source code changes do not reflect a particular feature, such as documentation.
  • Breaking things are submitting heavy model changes in default is bad. Use a dedicated feature branch instead.
  • New features are developed in a feature/xxx branch. Such new feature branches are forked from the the default branch. If the developer wants to have a stable starting point, he may fork the new feature branch from the last release tag. After finishing, the developer merges the feature branch into the default branch and closes it.
  • Hot fixes are are developed in a hotfix/xxx branch. Such new hotfix branch is forked from a release tag.
  • Product releases are tags in the default branch. Version numbers of the product are reflected in the tag name.
Clone this wiki locally