( partial tag lester-20050309a-poor refers to a state mid way between MERGE_POINT_C10 and MERGE_POINT_C11 at which a lot of testing was done and the software was found to be incapable of doing any non-BOC scans. This seemed to be something to do with the configuration not reaching the modules, and this has tentatively been assumed to be to do with Alan's config changes, and this prompted the merge of MERGE_POINT_C10->MERGE_POINT_D1 changes into MERGE_POINT_C11 which is presently (4.48pm 2005/03/09) underway. )
Begin with merge of ONLINE21_BRANCH
Described in Merge-C0-C3
Then proceed with the first merge of SctRodDaq_3_0_BRANCH ...
Described in Merge-C4-C5
Then proceed with the second merge of SctRodDaq_3_0_BRANCH ... (November 2004)
Described in Merge-C6-C7
Then proceed with the third and supposedly final merge of SctRodDaq_3_0_BRANCH incorporating all changes introduced during barrel 3 assembly at Oxford. (February 2005)
Described in Merge-C8-C9
Future ... hopefully there will be no more merges ...
Future BlankMergePage
(See also OmniMigration)