Skip to content

Branches

Colin Pfingstl edited this page Jun 8, 2020 · 1 revision

Overview

  • master - the productive base branch
  • hotfix-[version] - hotfixes for master
  • development - development branch for testing
  • feature/[name] - feature development branches

*[variable] are placeholders

Workflows

Feature Development

feature -> development

Features should be developed on their corresponding feature branch. After a feature is complete it should be pushed onto the development branch for further testing.

Release

development -> master

After the feature(s) on the development branch are ready for release, they should be pushed onto the master branch.

Hotfix

hotfix -> master

When bugs occure on the master (productive) branch, hotfixes should be made on the version specific hotfix branch.

Clone this wiki locally