Hi, while working on Squiggly, FlexPMD and the Mavenizer I too realized that the way we are currently doing things here is far from ideal as merging stuff back to master is allmost impossible.
How about not having a "develop" branch, but one for each sub-project. So when I start working on the mavenizer, I checkout "develop-mavenizer" and branch from that. As soon as my feature is finished, I merge my stuff from my feature branch back to "develop-mavenizer" now ... when a new version of the mavenizer is done, all I have to do, is merge everything oft he "develop-mavenizer" branch to master and don't have to think about what's in and what's not. Just a thought ... Chris