Skip to content

K11001GIT-5 Extend branch types by design branches #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nhjschulz merged 1 commit into from
Nov 18, 2025
Merged

K11001GIT-5 Extend branch types by design branches #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions doc/branches/branch_types.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,36 @@ gitGraph
A [Pull Request (PR)](./pull_request.md) **must** be performed to merge a `feature` into a `release`.
:::

## Detailed Design branches

When using markdown to create a detailed design in projects that require design approvals, the workflow as shown below shall be followed before starting the implementation in feature branches.

```{mermaid}
%%{init: { 'gitGraph': {'showCommitLabel': true}} }%%
gitGraph
commit tag: "v1.0.0"
branch release/v2.0.x
branch feature/multiuser_support
commit
commit
branch feature/SDD/multiuser_support
commit
checkout feature/SDD/multiuser_support
commit
checkout feature/multiuser_support
merge feature/SDD/multiuser_support
commit
commit
checkout release/v2.0.x
merge feature/multiuser_support
checkout main
merge release/v2.0.x tag: "v2.0.0"
```

:::{warning}
A [Pull Request (PR)](./pull_request.md) **must** be performed to merge a `feature` into a `release`. This ensures the proper documentation as previously mentioned.
:::

## Bugfix branches

Bugfix branches are indicated by the `bugfix/<name>` naming sheme. They are used to solve identified issues in already existing releases.
Expand Down