diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 26f24b7..2ec79b3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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.