Skip to content

(EN) Rules When the Using the Repositories

Thomas Fink edited this page May 22, 2023 · 1 revision

Branching Rules

master is the main branch

  • No one is allowed to push on it
  • The goal of all feature or bug branches
  • should always be able to become a release
  • can be rolled out to the demo environment

release branches are used for the prod environment

  • name follows the rule **release/Major.Minor **
  • only from the master-branch a release-branch may be created
  • release-branches are used to generate a version history

Development branches there are 2 different development tags: feature or bug - depending on the ticket name follows the rule: feature|bug/KOB-TicketNumber_TicketDescription after completion the branches are merged with a MR to the master

Hotfixes

  • if it is necessary to create a system critical fix this type will be used
  • hotfix branches follow the same naming scheme as feature and bug branches

Merge Rules

Code review by at least 1 other developer Successful tests No merge conflicts Technical review by at least 1 other developer --> If it happens that only one developer is present, then merge can also be performed without code and technical review. In this case, the critical eye of the request creator is appealed to.