Hi everyone, Sorry for the late reply. I will start to apply these changes when I come back from the CoC in Halifax :)
Em qua., 20 de set. de 2023 às 16:19, Jean-Baptiste Onofré <[email protected]> escreveu: > +1 > > Thanks ! It looks good to me. > > Regards > JB > > On Tue, Sep 19, 2023 at 5:15 PM Gláucia Esppenchutz > <[email protected]> wrote: > > > > Hi everyone, > > > > I was thinking about using the git-flow model of branching strategy. More > > or less having the following branches: > > "main" renamed to "release" > > "rel/x.x.x" > > "cherry-pick" > > "develop" > > "feat/bug" > > Here, we would use the "release" as the current stable state from Wayang. > > The "release" would have the same content as the latest "rel/x.x.x" > branch. > > > > About the "rel/x.x.x", the ideal would be to keep track of all versions > we > > have, and if anyone needs to use an older version, it will be there > > (likewise the tag). > > The "develop" branch would be where we merge the approved PRs, and it may > > not be stable since we are always opening and merging new content. To > work > > on a new feature, we would ask the developer to create a new > > "feature/bugfix" from the "develop" branch and work there. > > > > After we decided we were ready to make a new release, we would pick the > > features and fixes implemented on "develop" and cherry-pick them in a > > specific branch called "cherry-pick" (so innovative). After doing some > > testing and making sure we are able to compile and meet the Apache > guides, > > we will proceed to create the "rel/" branch by maven commands. > > > > Once the "rel/" conforms with Apache approvals, the content would be then > > merged into "release" (default branch), so developers who want to use > > Wayang have an easy and intuitive way to find the latest and stable > version. > > > > What do you think? :) > -- Gláucia Esppenchutz ----------------------------------------------------- Twitter: @lyuric19 Linkedin: https://br.linkedin.com/pub/gláucia-esppenchutz/47/81a/312
