From abd4722b0995ec727d77cd2f782a7446960babc5 Mon Sep 17 00:00:00 2001 From: Friedrich Weber Date: Wed, 21 Aug 2019 16:10:47 +0200 Subject: [PATCH] CONTRIBUTING: Improve description of internal workflow --- CONTRIBUTING.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 91f8c0de13..a28a0e3151 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -202,9 +202,7 @@ We perform code reviews. Each pull request is reviewed by one or more team membe In the following, we call the requester of a pull request the *developer* and differentiate between *external contributors* and *team members*: * An external contributor can simply open a pull request. The team then decides on a reviewer and accordingly requests a review. -* A team member explicitly requests a review from one or more other team members. In order to find a suitable reviewer, a developer may refer to the [development team list](Development-Team). - -Even after having created a pull request, the **developer is responsible for getting the pull request merged**. In particular, it is the developer's responsibility to choose a suitable reviewer. As the reviewer may not notice an incoming review request due to the high number of notifications, the developer is responsible for reminding the reviewer of pending review requests. If the reviewer is too busy to deal with the pull request, the developer chooses a different reviewer. +* A team member explicitly requests a review from one or more other team members. In order to find a suitable reviewer, a developer may refer to the [development team list](Development-Team). Even after having created a pull request, the **developer is responsible for getting the pull request merged**. In particular, it is the developer's responsibility to choose a suitable reviewer. As the reviewer may not notice an incoming review request due to the high number of notifications, the developer is responsible for reminding the reviewer of pending review requests. If the reviewer is too busy to deal with the pull request, the developer chooses a different reviewer. We *do not* request reviews from the whole team, because this makes it hard to assign responsibility. @@ -214,7 +212,7 @@ The reviewer uses the github [code review features](https://github.com/features/ ##### Merging a Pull Request -If the reviewer approves a pull request, and if no other reviews have been requested (see below), the reviewer should merge (or rebase or squash and merge) the pull request. When the pull request is merged, the reviewer deletes the feature branch. +If the reviewer approves a pull request, and if no other reviews have been requested (see below), the reviewer should merge (or rebase or squash and merge) the pull request. When the pull request is merged, the reviewer deletes the feature branch, if possible. ##### Multiple Reviewers