Branches

The repository structure is separated into following base branches:

• master - Contains only released commits (protected)
• develop - The main branch we merge features to (protected)
• feature/* - A feature branch holding the changes for a new feature
• fix/* - A fix branch for release branches, so we don't need to let developers commit directly to the release branch
• release/* - A release branch where we only commit fixes occurring during acceptance tests

Developing new features

All new features are developed on a feature branch which gets reintegrates to the main branch via a Merge/Pull Request

Naming conventions

Every feature-branch name starts with feature/ and thereafter a branch name, seperated by dashes.

Examples:

• feature/new-login-authentication
• feature/employee-registration