Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add merging prs policy #815

Merged
merged 2 commits into from
Jan 15, 2017
Merged

Add merging prs policy #815

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd02114
Add merging prs policy
doug-wade Jan 9, 2017
43b7015
Added additional clarification
drewpc Jan 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions MAINTAINING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.