03-30-2015, 06:08 AM
The general approach would be to split the repo into three tracks, release, testing and trunk. release track would not have any changes applied directly, testing would only have bugfixes merged not features, and trunk would be where features would be added. Then every few weeks/months we would take the trunk and make that the new testing and make what was in testing the new release. The actual planning of features would continue as we are now, its just they would get more testing and bugfixing before reaching release.