From 4bb3fee625f80ac322ae1353138274f2c319d4bf Mon Sep 17 00:00:00 2001 From: Jeremiah Senkpiel Date: Tue, 19 Apr 2016 01:10:47 -0400 Subject: [PATCH] doc: avoid merging other collaborator's PRs This has been implicit for a considerable amount of time. --- COLLABORATOR_GUIDE.md | 6 ++++++ doc/onboarding.md | 1 + 2 files changed, 7 insertions(+) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 90d73e80e9679b..3024633178155a 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -66,6 +66,12 @@ amongst Collaborators, consensus should be sought if possible. The lack of consensus may indicate the need to elevate discussion to the CTC for resolution (see below). +When the author of a pull request is another Collaborator, in _most_ cases it +should be left for them to merge. If the issue has gone stale, the Collaborator +should first be asked if they are ok with it being merged, as sometimes that is +not the case. Exceptions for this are frequently made for npm upgrades and +sometimes critical bug fixes. + All bugfixes require a test case which demonstrates the defect. The test should *fail* before the change, and *pass* after the change. diff --git a/doc/onboarding.md b/doc/onboarding.md index 1646080f3b3bbf..309c715b0aded5 100644 --- a/doc/onboarding.md +++ b/doc/onboarding.md @@ -130,6 +130,7 @@ Ensure everyone is added to https://github.com/orgs/nodejs/teams/collaborators * be sure to wait before merging non-trivial changes * 48 hours for non-trivial changes, and 72 hours on weekends. + * usually avoid merging another collaborator's pull requests * **make sure to run the PR through CI before merging!** (Except for documentation PRs)