devel-proj-branching.rst
changeset 1054 1718aa7d99bc
parent 1049 a1e7d8884936
child 1055 120af6ca4d58
equal deleted inserted replaced
1053:b50e1915af51 1054:1718aa7d99bc
    37    from release manager after reviewing code quality by QA team.
    37    from release manager after reviewing code quality by QA team.
    38  * From release branch you make tags to product releases for customer.
    38  * From release branch you make tags to product releases for customer.
    39 
    39 
    40 Names: vXX.YY.ZZ, maint
    40 Names: vXX.YY.ZZ, maint
    41 
    41 
       
    42 Custom branches.
       
    43 ----------------
       
    44 
       
    45 Custom branches intended to store modification to main release to make custom
       
    46 product build.
       
    47 
       
    48 Don't use custom branches at all. Instead redesign project to use customizable
       
    49 build. Expected problem:
       
    50 
       
    51  * You must manually propagate bug fixed to all custom branches.
       
    52  * It is not possible merge custom branches back to development branch.
       
    53 
    42 Workflows.
    54 Workflows.
    43 ==========
    55 ==========
    44 
    56 
    45 Regular development workflow.
    57 Regular development workflow.
    46 -----------------------------
    58 -----------------------------