diff --git a/development/development/git.rst b/development/development/git.rst index 70ea3a5d..5d236524 100644 --- a/development/development/git.rst +++ b/development/development/git.rst @@ -68,13 +68,20 @@ consider adding it as an idea to `phpBB Ideas //** or -**user//** to make clear from which developer's repository -the branch was merged. +Branch names must have a prefix ending with a slash. There are only 3 types of prefixes allowed: + +- ``feature/`` followed by a feature name for branches adding a feature. +- ``task/`` followed by a task name for branches which neither adding a feature nor fixing bugs. +- ``ticket/`` followed by a ticket number for branches fixing bugs. + +Branch naming examples: + +- ``feature/feature-name`` for features. +- ``task/task-name`` for tasks. +- ``ticket/12345`` for bugs fixes. + +| When branches go into the main phpBB repository they are renamed to **//** +| or **user//** to make clear from which developer's repository the branch was merged. Commit Messages ===============