aboutsummaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorThéo Zimmermann2018-03-21 16:19:35 +0100
committerThéo Zimmermann2018-03-21 16:19:35 +0100
commitef0fc7730df3cb585b621955010115407d80d2e7 (patch)
treee8cb3781df2ef614244e5fe8339a4f0c71cb5581 /dev
parentd7ea089b890e93d42c9b3ddb3b521590f73356bc (diff)
parent545f61580bbd67fc1e390904e5a7459fa6976e04 (diff)
Merge PR #7027: Refine a bit the decentralized merging process.
Diffstat (limited to 'dev')
-rw-r--r--dev/doc/MERGING.md16
1 files changed, 10 insertions, 6 deletions
diff --git a/dev/doc/MERGING.md b/dev/doc/MERGING.md
index df366a9781..f1dddbd0ef 100644
--- a/dev/doc/MERGING.md
+++ b/dev/doc/MERGING.md
@@ -9,19 +9,23 @@ The [CODEOWNERS](/.github/CODEOWNERS) file describes, for each part of the
system, two owners. One is the principal maintainer of the component, the other
is the secondary maintainer.
-When a pull request is submitted, GitHub will automatically ask these two
-maintainers for a review. If the pull request touches several parts, all the
-corresponding maintainers will be asked for a review.
+When a pull request is submitted, GitHub will automatically ask the principal
+maintainer for a review. If the pull request touches several parts, all the
+corresponding principal maintainers will be asked for a review.
Maintainers are never assigned as reviewer on their own PRs.
+If a principal maintainer submits a PR that changes the component they own, they
+must assign the secondary maintainer as reviewer. They should also do it if they
+know they are not available to do the review.
+
## Reviewing
-When principal maintainers receive a review request, they are expected to:
+When maintainers receive a review request, they are expected to:
* Put their name in the assignee field, if they are in charge of the component
- that is the main target of the patch (or if they are the only principal
- maintainer asked to review the PR).
+ that is the main target of the patch (or if they are the only maintainer asked
+ to review the PR).
* Review the PR, approve it or request changes.
* If they are the assignee, check if all reviewers approved the PR. If not,
regularly ping the author (if changes should be implemented) or the reviewers