|
1019
|
1 |
===========================
|
|
|
2 |
Project branching models.
|
|
|
3 |
===========================
|
|
|
4 |
.. contents::
|
|
|
5 |
|
|
|
6 |
Branch types.
|
|
|
7 |
=============
|
|
|
8 |
|
|
|
9 |
Development branch.
|
|
|
10 |
-------------------
|
|
|
11 |
|
|
|
12 |
* For main development activities.
|
|
1025
|
13 |
* For bug fixes, small enhancements.
|
|
|
14 |
* For development on initial project stage.
|
|
|
15 |
* Does not for experimental features!
|
|
1019
|
16 |
|
|
1021
|
17 |
Names: dev, devel, master, trunk
|
|
1019
|
18 |
|
|
1025
|
19 |
Feature branch.
|
|
|
20 |
---------------
|
|
|
21 |
|
|
|
22 |
* For experimental features.
|
|
|
23 |
* For large changes that can break main development.
|
|
|
24 |
* For incompatable changes that can break main development.
|
|
|
25 |
|
|
|
26 |
Names: feature-xxx
|
|
|
27 |
|
|
1019
|
28 |
Release branch.
|
|
|
29 |
---------------
|
|
|
30 |
|
|
|
31 |
* Used to support long running major/minor versions (include bug fixes or
|
|
|
32 |
features backporting).
|
|
|
33 |
* No any new features development.
|
|
1020
|
34 |
* Release branch created from development branch. Decision about branching come
|
|
|
35 |
from release manager after reviewing code quality by QA team.
|
|
1019
|
36 |
* From release branch you make tags to product releases for customer.
|
|
|
37 |
|
|
1021
|
38 |
Names: vXX.YY.ZZ, maint
|
|
|
39 |
|