I've enjoyed using gitflow in the Slider podling. It would also be good to have documentation of how to create patches (for contributors) and how to apply those patches (for committers). DeltaSpike and Accumulo both seem to use the git format-patch / git am method, with Accumulo also using --signoff (which is probably better). My understanding is this is preferable to just applying the patch and committing it with a note indicating the original contributor, as some other projects do, because it makes contribution tracking easier.
On Wed, Nov 26, 2014 at 8: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/ >
