If I understand the usecase correctly, then there should be these branches:
* master * release/4.4.1.x * release/4.4.2.x Note that there could be even more branches if "unstable" development continues on the develop branch or a bugfix branch is needed to create a bugfix on a released (i.e. tagged) revision. Surely merging becomes overly complicated when doing development in multiple release branches and development at once, but that's in my eyes not an issue of the branching model and it needs to be addressed somewhere else. 2017-05-19 23:01 GMT+02:00 Gary Gregory <garydgreg...@gmail.com>: > Howdy, > > Thank you for the link. > > This is fine until you want to manage more than once major version in one > repo, right? > > Over at HttpComponents, we have decided for now to keep to one repo, as > opposed to one repo per major version. > > So ATM for example in HttpComponents' HttpCore we have a 4.4.x and master > branch that are BOTH going to be used for releases. > > How do you deal with that in Gitflow? > > Gary > > On Fri, May 19, 2017 at 1:10 PM, Dominik Psenner <dpsen...@gmail.com> > wrote: > > > Hi, > > > > would we like to use gitflow for our named branches? [1] > > > > [1] https://datasift.github.io/gitflow/IntroducingGitFlow.html > > > > Cheers > > -- > > Dominik Psenner > > > > > > -- > E-Mail: garydgreg...@gmail.com | ggreg...@apache.org > Java Persistence with Hibernate, Second Edition > <https://www.amazon.com/gp/product/1617290459/ref=as_li_ > tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1617290459& > linkCode=as2&tag=garygregory-20&linkId=cadb800f39946ec62ea2b1af9fe6a2b8> > > <http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory-20&l=am2&o=1&a= > 1617290459> > JUnit in Action, Second Edition > <https://www.amazon.com/gp/product/1935182021/ref=as_li_ > tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1935182021& > linkCode=as2&tag=garygregory-20&linkId=31ecd1f6b6d1eaf8886ac902a24de418%22 > > > > <http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory-20&l=am2&o=1&a= > 1935182021> > Spring Batch in Action > <https://www.amazon.com/gp/product/1935182951/ref=as_li_ > tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1935182951& > linkCode=%7B%7BlinkCode%7D%7D&tag=garygregory-20&linkId=%7B% > 7Blink_id%7D%7D%22%3ESpring+Batch+in+Action> > <http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory-20&l=am2&o=1&a= > 1935182951> > Blog: http://garygregory.wordpress.com > Home: http://garygregory.com/ > Tweet! http://twitter.com/GaryGregory > -- Dominik Psenner
