...
| Branch | Description | Branches From | Merges To |
|---|---|---|---|
| main | Current release or release candidate | - | - |
| develop | New features scheduled for next minor release | - | main, hotfix-* (if appropriate) |
| hotfix-* | Bug fixes and minor changes scheduled for next bugfix release | main | main, develop |
| feature-* | Experimental or prioritized features | develop or (rarely) hotfix-* | develop, hotfix-* (if appropriate) |
| container-maintenance | Maintenance updates for container images, e.g. updated PHP version | main | main, develop, hotfix-* |
Managing develop and Pull Requests
...