Git - upstream branches + branches + release branches

Question

I used the workflow of branching sections http://www.golden-gryphon.com/software/misc/packaging.html

But since local testers and administrators do not like dropping release branches, I need to go to worklow with stable branches.

The only acceptable is the integration of the workflow. Now the problem is that I do not know how to work with dependent function branches in this workflow. When rebooting, it was simple, with each patch I simply rolled all the function branches that depended on this branch, and everything was in order. With the merge process, I cannot rebuild my function branches, but the merge seems a little crazy for that.

Is there a better approach?

Answer 1

With several long-term features, a model might look like this:

     o-----o  bugfix
    /       \
o--o--o------o------o  develop branch
       \      \      \
        o-o----o---o--o  long-term feature 1
           \    \   \  \
            o--o-o-o-o--o--o feature 2

Basically, you have a development branch and merge corrections with your development branch. The long-term branch of functions is the basis of the development branch, and you update it by merging new changes with this development branch.

Similarly, you have a function branch for reature 2 based on function 1, and you update it by merging a new branch of a new function.

When function 1 is complete, you combine it for development and update function 2 from the development branch:

     o-----o  bugfix
    /       \
o--o--o------o------o---o---o  develop branch w/ feature 1
       \      \      \ /     \
        o-o----o---o--o       \
           \    \   \  \       \
            o--o-o-o-o--o--o--o-o feature 2

Answer 2

, rebase, ( reflog rebase). , rebase, , .

:

             o-o-o--------------o         Release1+bugfixes
            /     \              \
o-----o----o--o-o--o---o----o-o-o-o-o--o  develop
       \     /               \     /
        o-o-o Feature 1       o---o Feature 2

, . . , , . , .

http://nvie.com/posts/a-successful-git-branching-model/.