diff --git a/MAINTAINING.md b/MAINTAINING.md index 667eabb49..e090b8d5f 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -35,3 +35,11 @@ Asini do most of the setup work for us, though: - `git add annotated-src` - `git commit --amend` - `git push -f upstream gh-pages` + +### Merging pull requests + +As React Server is growing the number of contributers and maintainers, our policy around +merging pull requests needs to grow to accomodate. Documentation changes and bug fixes +that include automated tests can be approved and merged by a single maintainer who is not +the author. All other changes must be approved by two maintainers (who are not the +author) prior to merging.