Hi Justin, now that we are starting in GIT we can't at this point set the future rules that will work. We should wait some days until people get the basis and then turn slowly to models that allow us to manage apache flex in a right way. Apache Flex y so Big so in the future I see submodules (break flex-sdk in submodules for diferent parts that already have its own relevance, and impose a dictator-lieutenants workflow (this is has nothing to do with NVIE that will continue to be use at branch level):
http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows#Dictator-and-Lieutenants-Workflow In the mean while, we can propose some rules that avoid proliferation un branches that will become useless. For example, a designated person could have the task of prune branches as a dictator or moderator based in its own decision (and people should have this into account). At the end great projects has a Dictator a then people organizates around lieutenants and each suborganization ensures the quality of a module or features. Then the dictator is the person designated to integrate in the final product, and that is what goes in a concrete version. But as I said at the beginning, we must first walk before run. People should take over the git basis a work a bit before such organization. 2013/3/12 Justin Mclean <jus...@classsoftware.com> > Hi, > > > we should only share things with great potential to be merged in develop. > > Seems reasonable to me - but it may become a bit of a mess if we are not > careful. > > More questions for the wiki that need an answer: > > How do we avoid the big bang integration issues that occur with this > model? For instance making 4.9 was a huge pain having to merge in all the > changes that had occurred since 4.8, I would hate to have to do that with > 20 or 30 branches. > > If we have a large number of branches is it the release managers job to > merge them all or the person who created the branch, what if they are no > longer about? > > How do we prune branches that are no longer actively been worked on? > > Thanks, > Justin -- Carlos Rovira Director de Tecnología M: +34 607 22 60 05 F: +34 912 94 80 80 http://www.codeoscopic.com http://www.directwriter.es http://www.avant2.es