Hi Gary Gregory <[email protected]> wrote on 19.05.2017 23:01:10: > 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?
As I understood gitflow, release branches are "short-living" branches, only used for preparation of a particular release. Once the release is shipped the branch is removed. If you need to support several versions of your software in the field (e.g. keep shipping feature updates for 2.x and 1.x; aside from hot fixes), "support-brachnes" is what you're looking for. They behave like "the" develop branch, but for supporting older version. The GitVersion Manual has some nice example images for this: http://gitversion.readthedocs.io/en/latest/git-branching-strategies/gitflow-examples/#support-branches Regards, Jonas > > Gary > > On Fri, May 19, 2017 at 1:10 PM, Dominik Psenner <[email protected]> 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: [email protected] | [email protected] > 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
