@@ -6,7 +6,11 @@ This helps with the validation of code prior to making it available in the offic
## Available supported branches
-`master` branch: new developments and updates targeting run 3. Builds on current supported platforms against latest version of Gaudi
-`master` branch: long-term developments for run 3, not meant for immediate inclusion in the data taking (e.g., for end-of-year Sprucing).
Development for run3 and upgrade2 simulation should target this branch unless it also needed for 2024-taking.
Builds on current supported platforms against latest version of Gaudi.
-`2024-patches` branch: fixes and additions for the 2024 data-taking. By default, it is understood that a MR targeting this branch should also be included in `master`, so the `master` branch is regularly synchronised with this one. If you are putting in a temporary fix that is not meant as a long-term solution and should not be included in `master`, please state it clearly in the MR description. Builds on current supported platforms against latest version of Gaudi.
-`sim10-patches` branch: for patches to Gauss in Sim10 simulation workflows. Builds on current supported platforms against latest version of Gaudi
...
...
@@ -42,6 +46,6 @@ This helps with the validation of code prior to making it available in the offic
- Any changes or fixes for Run 1 and Run 2 analysis (or re-reconstruction, re-stripping) should go to the `run2-patches` branch.
Fixes also relevant to specific `XXX-patches` branches should be flagged as such, they will be propagated by the applications managers.
- Any changes specific to Run 3 should go to `master`.
- Any changes specific to Run 3 should go to `master` or `2024-patches`. See above for when using one or the other.
In doubt, please get in touch before creating a MR.
