Procedure for synchronisation of branches for special running conditions
The following procedure has been agreed to minimise the work to propagate MR from one year reference branch to branches for special running conditions.
- A branch should be made from the reference for the different running condition of the same
Sim-TYPE/YEAR
. - Once a MR is accepted into the reference branch
Sim-TYPE/YEAR
a merge of the reference branch `Sim-TYPE/YEAR' will be made targeting the branch of the special running conditions instead of cherry-picking the initial MR
Example:
- branch
Sim10/2018-PbPb
fromSim10/2018
- merge changes in Velo Position in
Sim10/2018-PbPb
- merge change in dE/dx calo in
Sim10/2018
- merge change in IT dead channels map in
Sim10/2018
- make new tag in
Sim10/2018
- merge
Sim10/2018
intoSim10/2018-PbPb
- make new tag in
Sim10/2018-PbPb
This should also allow to keep track more easily of the difference between branches and should be applied also to the YEAR-mu
branches.