ticketfrei
/
ticketfrei3
8
1
Fork 0
Code Issues 11 Pull Requests 2 Projects 1 Releases Wiki Activity

[doc] No Gods, No Masters - let's do releases on development branch

pull/13/head
missytake 2023-03-18 14:50:15 +01:00
parent 4029770c90
commit 39a21fe34a
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CONTRIBUTING.md
View File

@ -60,14 +60,9 @@ email address and register via frontend or manually at `http://localhost:8000/ap
## Contribution Guidelines
### Branches
- **Master:** The master branch tracks the last stable release.
- Releases will be done using release tags.
- Force push and pushes without group consent are disallowed.
- There never should be a merge commit from development into master!
- **Development:** The development branch is used to add new features.
- Only rebase of feature branches is allowed.
- On Release the development branch will be rebased onto master and a release
tag will be created on master
- On Release a release tag will be created
- **Feature-Branches:**
- A feature branch will be used to develop a feature.
- It belongs to one developer only and force push is allowed.