Development principles

Git Branching strategy

We are using a Gitflow as a branching model. A detailed introduction to Gitflow can be found here.

Main branch

The main branch stores the official release history.

Development branch

The development branch serves as the integration branch for new feature branches

Feature branches

Each new feature is implemented in a separate feature branch. Feature branches use development as their parent branch. When a feature is completed the respective branch gets merged back into development.

A feature branch is created the following way:

git checkout development
git checkout -b feature_branch

Pull requests

Once a feature or a hotfix branch is completed a new pull request against the development (in case of feature branches) or the main branch (in case of hotfix branches) is created:

1. Navigate to the list of available branches. Depending on the concrete setup the new branch is available directly on the main repository or on your fork of the main repository.

2. Click on "New pull request"

3. Select the target (base) branch:
   • For feature branches select the development branch
   • For hotfix branches select the main branch
4. Provide a summary of your changes in the textfield
5. Click on "Create pull request"

Code linting

tbd

Unit testing

tbd

Functional testing

tbd