I think a lot of this is going to depend on our development process. If we can establish a regular and structured release process where the releases are long lived (maybe weekly or bi-weekly), I think gitflow makes a lot of sense. Also, as team size and number of committers grows the benefit of the added process would certainly be realized. Until then however and assuming we release at our discretion initially, using the feature branch workflow may make more sense.
Matt On Wed, Nov 26, 2014 at 11:35 AM, Tony Kurc <[email protected]> wrote: > I wanted to kick off a discussion about workflow in git. There are a lot of > techniques in git for working effectively as a team, managing several > product versions at once, and for branching and merging code back in. It > looks like several other apache projects have guides for their team > conventions, such as Deltaspike [1] and Accumulo [2], I think it would be > prudent to work on some conventions for NiFi. I've used several styles, one > of which works well for other projects I've worked on is called gitflow > [3]. I like the concepts of gitflow, but I really don't like depending on > maven plugins to execute the conventions. I'd be in favor of something like > gitflow, not sure if others had opinions. > > Tony > > [1]https://deltaspike.apache.org/suggested-git-workflows.html > [2] https://accumulo.apache.org/git.html > [3] > > https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/ >
