- read this developer guide completely for essential information and practices to follow
- read this developer guide completely for essential information and practices to follow
...
@@ -51,7 +52,7 @@ Must merge back into:
...
@@ -51,7 +52,7 @@ Must merge back into:
`develop`**and**`main` simultaneously
`develop`**and**`main` simultaneously
Branch naming convention:
Branch naming convention:
`release-vX.Y.Z` where X is the major version, Y is the minor version and Z is the patch version (see [Semantic versioning](#Semantic-versioning))
`release-vX.Y.Z` where X is the major version, Y is the minor version and Z is the patch version (see [Semantic versioning](#semantic-versioning))
### Hotfix branches
### Hotfix branches
> Hotfix branches are very much like release branches in that they are also meant to prepare for a new production release, albeit unplanned. They arise from the necessity to act immediately upon an undesired state of a live production version. When a critical bug in a production version must be resolved immediately, a hotfix branch may be branched off from the corresponding tag on the master branch that marks the production version.
> Hotfix branches are very much like release branches in that they are also meant to prepare for a new production release, albeit unplanned. They arise from the necessity to act immediately upon an undesired state of a live production version. When a critical bug in a production version must be resolved immediately, a hotfix branch may be branched off from the corresponding tag on the master branch that marks the production version.