-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Pull Request Review Procedure
Christoph Buchner edited this page Aug 28, 2013
·
3 revisions
Suggested values: (X)=14, (N)=3 and (M)=14
- Someone submits a change for discussion:
- For small but clear changes, an issue is opened on GitHub describing the bug or feature.
- For larger structural changes, an email is sent to the openFrameworks dev list before it becomes an issue.
- If the issue is going in the wrong direction, a team member (the Core or section leaders) must comment on the issue within a certain number of days (X). If the submitter writes code before getting any feedback, they need to understand that there is no expectation that their code will be merged. So there are three possibilities:
- there is no approval or rejection, and a PR may not be accepted further down the line
- a team member approves the proposal, and a matching PR is eventually accepted
- a team member rejects the proposal, and the issue is closed or rewritten until that team member is satisfied.
- A pull request is submitted.
- The GitHub leader (or, optionally, any team member) checks that the PR is well-formatted. If it does not fit the following criteria, they will ask that it is fixed:
- the PR is in its own branch
- the PR is submitted to develop
- the PR only has commits specific to the relevant issue
- the PR has necessary information in the description, including how it was tested and how others can test it.
- if the PR content is such that a changelog entry is necessary, make sure any relevant information has been added to
CHANGELOG.md
. - Other team members start PR-specific discussion. Discussion at this point is comprised of:
- reviewing the code for any obvious problems
- providing feedback about personal experience with this topic
- testing relevant examples on untested platforms
- thoroughly stepping through the changes to understand potential side effects
- examining discrepancies between the original issue(s) and the actual PR
- @summoning any relevant team members
- Anyone who takes time to do any of the above can offer their assessment. Note that this should not be the time to decide whether the PR is desired or not -- that should have happened earlier. The only condition where a PR should be completely rejected is when it has not gone through the entire process (e.g., someone submitted the PR without posting an issue). The assessment may be one of the following, coupled with a note about which of the above types of review were carried out (e.g., some people might just run an example, others might do more thorough testing):
- good to merge
- good to merge with minor changes (which are specified)
- not good to merge without major changes (which are specified)
- If there are more than a certain number of votes (N) saying "good to merge", with at least one of them being a thorough code review, then a Core member is @summoned to execute the merge.
- If the PR is not merged within a certain number of days (M) without feedback from the Core, the relevant section leader may execute the merge. This can be stopped at any time by a single constructive vote against merging ("Don't merge this, until you change...") but not by a non-constructive vote ("Don't merge this, I haven't had a chance to look at it yet...").