Commit 65a8d9f2 authored by Guillaume Pasero's avatar Guillaume Pasero

DOC: simplify a bit the rules for merge requests

parent 510509dc
......@@ -60,12 +60,8 @@ which we will manually merge.
Caveat: even if the Dashboard build on develop branch is broken, it is not
allowed to push fixes directly on develop. The developer trying to fix the
build should create a merge request and submit it for review. However in that
case, it is not mandatory to wait for a green dashboard if:
* the developer has confirmed that proposed changes fix the compilation
* the reviewers agree for a fast merge.
build should create a merge request and submit it for review. Direct push to
develop without review must be avoided.
### Commit message
......@@ -102,7 +98,10 @@ OTB team.
* Merge requests **must receive at least 2 positives votes from core developers** (members of Main Repositories group in Gitlab with at least "Developer" level; this includes PSC members) before being merged
* The merger is responsible for checking that the branch is up-to-date with develop
* Merge requests can be merged by anyone (not just PSC or RM) with push access to develop
* Merge requests can be merged once the dashboard is proven green for this branch
* Merge requests can be merged once the dashboard is proven green for this branch.
This condition is mandatory unless reviewers and authors explicitely agree that
it can be skipped (for instance in case of documentation merges or compilation
fixes on develop)
Branches can be registered for dashboard testing by adding one line in `Config/feature_branches.txt` in [otb-devutils repository](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-devutils.git).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment