Jeff Godin suggested that we consider using git merge –no-ff for master rather than cherry-picking from working branches
Committers would sign off on the merge commits; the merge commits could also be used to store test plans
There was general agreement that this is worth trying
Jeff will send a proposal open-ils-dev
(also, we'll need to fix the pinesol Git plugin to handle merge commits properly)