devel-proj-branching.rst
changeset 1025 6d7c8cb191cd
parent 1021 13bf431d9f42
child 1026 a6f51fcdb6f2
equal deleted inserted replaced
1024:dd94730a04f4 1025:6d7c8cb191cd
     8 
     8 
     9 Development branch.
     9 Development branch.
    10 -------------------
    10 -------------------
    11 
    11 
    12  * For main development activities.
    12  * For main development activities.
    13  * Usually for bug fixes, small enhancements.
    13  * For bug fixes, small enhancements.
    14  * Also for development if project on initial development stage.
    14  * For development on initial project stage.
       
    15  * Does not for experimental features!
    15 
    16 
    16 Names: dev, devel, master, trunk
    17 Names: dev, devel, master, trunk
       
    18 
       
    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
    17 
    27 
    18 Release branch.
    28 Release branch.
    19 ---------------
    29 ---------------
    20 
    30 
    21  * Used to support long running major/minor versions (include bug fixes or
    31  * Used to support long running major/minor versions (include bug fixes or