Collaborative Computational Project No. 4
|CCP4i2 Webpage||CCP4 Webpage||Documentation||CCP4 Tutorials||Coot Wiki||CCP4MG|
The current plan is to discontinue the current version of trunk in the future. Trunk has to some extent has functioned as the release branch for 7.0, and as such we should continue to maintain it for now (bug fixes applied to this branch, fixes that are then merged into dev) so Charles can continue to cut 7.0 releases in the immediate future.
In the future we should move to having one development tree to avoid confusion, the idea is to work from what is now dev in the future, and from dev branch off release versions. Any major new work, for example the QT5 work currently in progress will be branched off dev as well to keep it isolated from releases, until it is ready for general releas. The above diagram is indicative of how this should work.
To Summarise :