File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ Integration branch: **develop** (protected, default)
35
35
- Tags can be used for test releases and should be distinct from existing version tags
36
36
- Tags will create full releases, incl. docker images
37
37
38
- Maintanance branches: ** maint-A.B.x** (protected)
38
+ Maintenance branches: ** maint-A.B.x** (protected)
39
39
- Where A and B are a specific version, and 'x' is used in the branch name to indicate which that the patch level is being maintained in this branch.
40
40
41
41
Feature-, bugfix and development branches:
@@ -44,7 +44,7 @@ Feature-, bugfix and development branches:
44
44
## Development cycle
45
45
46
46
Development takes place on ** develop** . It should always build and any larger features should be done in feature branches.
47
- If there are maintanace branches, each feature should be backported to a mintanace -branch.
47
+ If there are maintenance branches, each feature should be backported to a maintenance -branch.
48
48
49
49
Releases are tagged on ** master** using v+[ SemVer] ( https://semver.org/ ) . E.g.: ` vX.Y.Z `
50
50
You can’t perform that action at this time.
0 commit comments