Changes between Version 41 and Version 42 of WikiStart_old

Timestamp:

08/21/13 17:41:53 (11 years ago)

Author:

sil

Comment:

--

WikiStart_old

@@ -109 +109 @@
  * master branch, called `master`.
  * stable branches, called `stable/<version>` (where versions consist of 2 digits like `1.0`, `1.1`, `2.0`, etc.). Those stable branches are tagged whenever bugfixes are done for a bugfix-release. Those bugfix-releases (for example as for `stable/1.0`) are tagged as `stable/<version>.<patchlevel>`, where the patchlevel is an integer that increments for each (couple of) merged bugfix(es). Stable branches are branched from master, and merged back to master whenever it's tagged as a new bugfix-release.
- * bugfix branches, in which we have a branch for each bugfix to patch, branched from a stable branch. These branches can be locally. The branches are called `bugfix/#>` where the hash-symbol is a number referring to the ticket of the bug-report.
- * 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 `feature/#`, where the hash-symbol is a number referring to the ticket for the feature.
+ * bugfix branches, in which we have a branch for each bugfix to patch, branched from a stable branch. These branches can be locally. The branches are called `bugfix/#]/human_readable_label]` where the hash-symbol is a number referring to the ticket of the bug-report, and the `human_readable_label` an optional label to know what it's about (without knowledge of the tickets).
+ * 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 `feature/#[/human_readable_label]`, where the hash-symbol is a number referring to the ticket for the feature, and the `human_readable_label` an optional label to know what it's about (without knowledge of the tickets).
 
 == Versioning ==