Skip to content

Commit

Permalink
fix:Update CONTRIBUTING.md (#863)
Browse files Browse the repository at this point in the history
Added "fix" as a valid feature branch, as discussed today with the team.

Signed-off-by: Thorben Hartmann <122102805+thrbnhrtmnn@users.noreply.github.com>
  • Loading branch information
thrbnhrtmnn authored and larserbach committed Feb 19, 2024
1 parent bb0c453 commit 1dd48a3
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,10 @@ For contributions we are using
The branch name should not exceed a maximum character count of 140. Each branch should follow the following structure:
`<branchType>/<issueNumber>_<summary>`

- **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`
- **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`


## Commits

Expand Down

0 comments on commit 1dd48a3

Please sign in to comment.