Skip to content
Snippets Groups Projects
Commit 9a93a8d4 authored by Eduardo Rodrigues's avatar Eduardo Rodrigues
Browse files

Merge branch 'erodrigu-README-file' into '2018-patches'

Added a README file to the project

See merge request !206
parents 60d876e1 73a9cf36
No related branches found
No related tags found
1 merge request!206Added a README file to the project
# General information
The project contains several active and maintained branches, such as the `201X-patches` branches.
They are all protected, meaning that code cannot be pushed into them directly but only through merge requests (MRs).
This helps with the validation of code prior to making it available in the official branches for future releases.
## Where to commit code to
- Bug fixes for 2018 data-taking should be committed as MRs to `2018-patches`. They will then be propagated to the
`run2-patches` branch (and master if appropriate) by the applications managers.
- Any other changes for Run 1 and Run 2 analysis (or re-reconstruction, re-stripping) should go to the `run2-patches` branch.
They will then be propagated to `master (if relevant also for Upgrade) by the applications managers.
- Any changes specific to Upgrade should *only* got to `master`.
- Things may be different for bug fixes to old and/or specific versions of DaVinci, in which case it is probably best to discuss
unless you know exactly what you are doing.
In doubt, please get in touch before creating a MR.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment