Hi Remi, IMHO, the Github front page needs to better explain what's going on and what is expected from a dev standpoint. I'll see if I can put something up there to call things out. Especially if people aren't familiar with or confused by Github projects or Github.
The branching and commit model is Github-flow. ( https://guides.github.com/introduction/flow/). Basically, a single master that has to be buildable and deployable at all times. This represents the next release. Developers create their own branches for things they want to work on. If a developer has something they want to contribute back, they can create a pull request for whatever they are working on and then it can be discussed. Ultimately, pull requests are merged into master once they are deemed ready. When we release a version, we create a release branch from master, update the Jenkins builds, and publish to the Maven repos. It's pretty lightweight (I think far more so than Git-blow) and simple to use and maintain. It also integrates extremely well with Maven automation when it comes to branching and releasing. There is also good cross-platform and command-tooling that supports Github-flow. I'll try to get something more descriptive on the project page this week, but I can't see us changing this right now. If we had a ton of traffic and movement and it was warranted, Git-flow would probably be something we could look at. -- Rick On Sun, Aug 2, 2015 at 4:32 AM, VANKEISBELCK Remi <[email protected]> wrote: > Hi folks, > > Just had a peek at the repo, and didn't really understand the branches in > there. > > Is master supposed to be the "trunk" (or "develop") ? > The "version" branches are release branches ? > ... > > I suggest we follow the Git Flow conventions : > http://nvie.com/posts/a-successful-git-branching-model/ > > It's a branching model that IMHO works fine in small-medium projects. It > is commonly used and therefore easy to understand, by convention. > > The idea is to have a "develop" branch (LATEST-SNAPSHOT) to be used for > "day to day" development (and feature branches if you want), and a "master" > branch for releases (and release branches). > > You can install the Git Flow command line tooling for easy management of > all this. It's really a useful layer over git IMO. > > What do you think ? > > Cheers > > Remi > > PS : I'm taking 1.6.0 out for a spin, trying to see if I can upgrade in > Woko... I use loads of extensions so I guess it's a good test. Will let you > know. > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Stripes-development mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/stripes-development > >
------------------------------------------------------------------------------
_______________________________________________ Stripes-development mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/stripes-development
