Skip to content
Snippets Groups Projects
Commit e0f512b7 authored by Elisabetta Pianori's avatar Elisabetta Pianori
Browse files

Merge branch 'revert-c5e5a0d3' into 'main'

Revert "Update CONTRIBUTING.md"

See merge request !306
parents 4bb5a0d4 3f9ad33f
No related branches found
No related tags found
2 merge requests!313update NTC coefficients for ITkPix quads,!306Revert "Update CONTRIBUTING.md"
Pipeline #6247561 passed
......@@ -7,21 +7,20 @@ __Project Maintainers:__
- Simone Pagan Griso
- Karol Krizka
- Elisabetta Pianori
- Daniel Antrim
## Definition of Roles
The _Project Manager_'s role is to keep an overview of the development happening in labRemote. The PM's responsibilities include:
- being the main contact for labRemote
- regularly merging the `devel` branch into `main`
- regularly merging the `devel` branch into `master`
- merging all Merge Requests
The _Maintainers_ have a very good knowledge of the labRemote code base and are responsible for reviewing Merge Requests.
## Usage of The devel Branch
The `main` branch is to be assumed as relatively stable. All new development should be merged into the `devel` branch. The `devel` branch is __not__ to be used for applications!
The `master` branch is to be assumed as relatively stable. All new development should be merged into the `devel` branch. The `devel` branch is __not__ to be used for applications!
The `devel` branch will be merged into `main` every Monday, with weeks skipped based on the Project Manager's discretion.
The `devel` branch will be merged into `master` every Monday, with weeks skipped based on the Project Manager's discretion.
## Making Changes to labRemote
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment