Skip to content

Package development branching system

Jump to bottom
Martin van der Schelling edited this page Jan 16, 2023 · 1 revision

Branching strategy

! Each of the open circles is a commit.

In the above image, there are 3 type of branches:

  • the main branch (main); the stable version of the software. Each commit is labeled with a version (e.g. v1.0)
  • pull-request branches ( pr/v2.0 and pr/v3.0); the development branch for the target version
  • feature branches (feature1, feature2, feature3); work-branches for implementing features

The full cirlces represent pull-requests. There are three types of pull requests

  • Blue: Pull request to pull-request branch (pr/vX.X)
  • Black: Pull request to main branch
  • Pink: Hotfix; direct commit on main branch (Technically not a pull-request)

Branches

main branch

explanation of main branch

pr/vX.X branch

pull-request branch

feature branches

feature branches

Pull requests

Blue circle: From feature to pr/vX.X

explanation of checks that are done with this pull request

Black circle: from pr/vX.X to main

explanation of checks that are done with this pull request

Pink circle: hotfix

explanation of checks that are done with this pull request

Clone this wiki locally