Development principles
We are using a slightly modified version of Gitflow as a branching model. A detailed introduction to Gitflow can be found here.
The main branch stores the official release history. The current version of the main branch always stores the latest release.
The development branch serves as the integration branch for new feature and bugfix branches. It reflects the latest stable changes in the current development cycle.
Each new feature is implemented in a separate feature branch. Feature branches use development as their parent branch. When a feature is completed the respective branch gets merged back into development.
A feature branch is created the following way:
git checkout development
git checkout -b feature/newfeature
Once the development branch has acquired enough features and bugfixes for a release, a release candidate branch is created based on the current version of the development branch. For details on the release procedure please refer to the release procedure documentation.
The release candidate always includes a version number and is created in the following way:
git checkout develop
git checkout -b RC-1.2.0
Once a release candidate is approved the respective branch is merged into the main branch.
Similar to feature branches, the bugfix branches are created directly from development. In contrast to hotfixes, bugfixes are not considered criticial and do not require a fast new release. Bugfix branches are created the following way:
git checkout development
git checkout -b bugfix/newbugfix
Hotfix branches are used to quickly patch production releases in case of critical errors. Hotfix branches are created directly from main and merged back into main and development as soon as they are completed. Once the hotfix is applied a new release shall be created.
git checkout main
git checkout -b hotfix/newhotfix
Once a feature or a hotfix branch is completed a new pull request against the development (in case of feature branches) or the main branch (in case of hotfix branches) is created:
- Navigate to the list of available branches. Depending on the concrete setup the new branch is available directly on the main repository or on your fork of the main repository.
- Click on "New pull request"
- Select the target (base) branch:
- For feature branches select the development branch
- For hotfix branches select the main branch
- Provide a summary of your changes in the textfield
- Click on "Create pull request"
tbd
PHP Unit
tbd
tbd