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

Update CONTRIBUTING.md

parent 9dfbb40f
No related branches found
No related tags found
3 merge requests!313update NTC coefficients for ITkPix quads,!252Add timestamp to logging,!233WIP: Support for Huber chillers with ComGate interface
Pipeline #2596666 passed
Stage: build
Stage: package
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 3 deletions
CONTRIBUTING.md
+ 4
− 3
View file @ c5e5a0d3
......@@ -7,20 +7,21 @@ __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 `master`
- regularly merging the `devel` branch into `main`
- 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 `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 `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 `devel` branch will be merged into `master` every Monday, with weeks skipped based on the Project Manager's discretion.
The `devel` branch will be merged into `main` every Monday, with weeks skipped based on the Project Manager's discretion.
## Making Changes to labRemote
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment