Hi, > Unfortunately, Flex isn't as modular as it should be. Perhaps not on the large scale architecture level. But I still see no issue with checking fixes to JIRA issues or new components (tested obviously) into trunk as they would be small bite sized chunks (and generally low risk), even changes to existing components should be able to be done in bite size chunks, for major architecture changes I would expect a branch.
> And given that I don't think we have enough tests to keep trunk in good shape How many Mustella tests just got checked in? 10,000? As all development is in public you get many people eyes on each check in. Changes to trunk can be very easily reverted if needed. > I'd lean towards playing it safe with an unstable branch until we can prove > that we can keep it in shape. Let say we go with this. At any one time you may have several people patches etc in unstable and if it's decided that one is good enough to put into trunk how do you merge that patch into trunk and not the other patches? Even if the patches are in different parts of the code I can see issues here. How do we know when the unstable branch isn't broken? Do we need to set up more CI instances one for unstable and another for any other long running branch? Do we need to run Mustella over both trunk and unstable before doing a merge? Justin
