From 22895d818a33ed1ff276692d87fbac16abab7377 Mon Sep 17 00:00:00 2001 From: Thorben Hartmann <122102805+thrbnhrtmnn@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:12:05 +0100 Subject: [PATCH] fix:Update CONTRIBUTING.md Added "fix" as a valid feature branch, as discussed today with the team. Signed-off-by: Thorben Hartmann <122102805+thrbnhrtmnn@users.noreply.github.com> --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 26ee63f2b..a2a978e5b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -130,7 +130,7 @@ For contributions we are using [Gitflow as branching strategy](https://www.atlas The branch name should not exceed a maximum character count of 140. Each branch should follow the following structure: `/_` -- **branchType:** As defined in the Gitflow branching strategy, there are different types of branches. The allowed types are: `release`, `hotfix` and `feature`. 
 +- **branchType:** As defined in the Gitflow branching strategy, there are different types of branches. Besides the existing `main` and `develop` branches, the allowed types for newly created branches are: `release`, `hotfix`, `feature` and `fix`. The branch type `fix` is not defined in Gitflow, but is used exactly like a `feature` branch. It was added to be more granular in our naming convention and to differentiate between branches that implement something new (`feature`) and those that change something that already exists (`fix`). - **issueNumber:** The issue number of your task. For example: `421`
 - **summary:** A few words describing the issue. When there are multiple words, you can use a hyphen to link the words. For example: `text-area-storybook-documentation`