Skip to content
Snippets Groups Projects

Changes

Page history
  • New page
  • Templates
    • Update GitLab MWT authored by Thomas Vierjahn's avatar Thomas Vierjahn
    Show whitespace changes
    Inline Side-by-side
    Showing
    with 6 additions and 1 deletion
    GitLab-MWT.md
    View page @ d4c1107a
    ...@@ -90,12 +90,17 @@ In order to track issues and to simplify merge requests, every commit addressing ...@@ -90,12 +90,17 @@ In order to track issues and to simplify merge requests, every commit addressing
    Whenever new code -- due to issues and milestones -- is added to the code base, a feature branch is created. Whenever new code -- due to issues and milestones -- is added to the code base, a feature branch is created.
    Feature branches branch off develop and eventually merge back into it. Feature branches branch off develop and eventually merge back into it.
    They are named after the milestone spawning the branch.
    They are named after
    * the milestone spawning the branch; prefixed `%MILESTONENUMBER_`
    * a single issue spawning the branch; prefixed `#ISSUENUMBER_`.
    Consequently, no new code can be written without first filing a functionality issue (or a bug report); and consequently not without prior discussion. Consequently, no new code can be written without first filing a functionality issue (or a bug report); and consequently not without prior discussion.
    A feature branch has to be closed via a merge request. A feature branch has to be closed via a merge request.
    A feature branch adresses only a single bit of functionality aka a milestone. A feature branch adresses only a single bit of functionality aka a milestone.
    Alternatively, they address only a single feature or bug fix aka an issue.
    *Note*: Feature branches must not grow too large, otherwise merges become infeasible. *Note*: Feature branches must not grow too large, otherwise merges become infeasible.
    ......