Skip to content

Project Branches Workflow and Tagging

Jump to bottom
joergboe edited this page Aug 7, 2018 · 7 revisions

Current Branches

  • Master - Main development branch - target for next official release for the toolkit
  • v1.0.x_m - Maintenance branch for toolkit release 1.0.x
  • v1.1.x_m - Maintenance branch for toolkit release 1.1.x
  • v1.1.1_m - Maintenance branch for toolkit release 1.1.1
  • gh_pages - Toolkit documentation

Workflow

Use feature development branches and bugfix branches to develop new features or bug fixes. ( dev_xxx, feature_xxx or fix_xxx ) The recommended workflow is Git Feature Branch Workflow. When ready, submit a pull request against the target branch (master).

Please ensure that the branch is deleted once merged.

Users with no write access to this repository must use the Forking Workflow

Toolkit versions and version tagging

Toolkit releases should follow to General Toolkit Version Guidelines Use an annotated git tag to flag a specific toolkit release. Tag names should have the form: v.X.Y.Z Create no maintenance/release branch if it is not absolutely necessary.

Clone this wiki locally