| 87 | |
| 88 | == Work on repository == |
| 89 | |
| 90 | We are working with 4 kinds of branches: |
| 91 | * master branch, called `master`. |
| 92 | * stable branches, called `stable/<version>` (where versions are like `1.0`, `2.0`, etc.), and (as for `stable/1.0`) tagged as `stable/<version>.<release>` where the release is an integer that increments for each (couple of) merged bugfix(es). Stable branches are branched from master, and merged back to master whenever there is a new (set of) bugfix(es) to release. |
| 93 | * bugfix branches, in which we have a branch for each bugfix, branched from a stable branch. These branches can be locally. The branches are called `<stable-branch>/bugfix/#>` where the hash-symbol is a number referring to the ticket of the bug-report. |
| 94 | * feature branches, in which we have a branch for each new feature, branched from master. These branches can be locally, however can be public for collaboration-purposes as well. As a naming-convention we'll call these branches `master/feature/#`, where the hash-symbol is a number referring to the ticket for the feature. |
| 95 | |