...
- One hotfix branch exists per minor release. That is,
hotfix-1.0.xis used for (eg)1.0.1and1.0.2. While these will typically branch from and merge intomain/master, they may also branch from any release tag, and may not merge intomain/masterifmain/masterhas already moved on to a new minor (or major) release. Bothmain/masterandhotfix-*should be deployable at all times. - Release branches are not currently used. All features for release merge into
develop, which eventually merges intomain/masterto create a release tag. - Feature branches (topic branches) are optional and should be named for the corresponding JIRA issue (eg:
feature-co500). In general, feature branches are used when merging directly intodevelopis undesirable, perhaps because the feature is experimental. Features may also be used when a priority enhancement is made for a specific deployment, and the enhancement is required before the next scheduled minor release.- Feature branches may also be used to target develop for a future (ie: not the next) feature release. In this case, the feature branch is named for the target release (eg:
feature-3.1) rather than a JIRA issue.
- Feature branches may also be used to target develop for a future (ie: not the next) feature release. In this case, the feature branch is named for the target release (eg:
...
| Note |
|---|
In general, do not merge |
...
| Branch | Description | Branches From | Merges To |
|---|---|---|---|
| main or master | Current release or release candidate | - | - |
| develop | New features scheduled for next minor release | - | main/master, hotfix-* (if appropriate) |
| hotfix-* | Bug fixes and minor changes scheduled for next bugfix release | main/master | main/master, develop |
| feature-* | Experimental or prioritized featuresmaster for prioritized development, otherwise any suitable branch | develop or (rarely) hotfix-* | develop, hotfix-* (if appropriate) |
...