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

doc: avoid merging other collaborator's PRs #6269

Closed
wants to merge 1 commit into from
Closed

doc: avoid merging other collaborator's PRs #6269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions COLLABORATOR_GUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

@Fishrock123 Fishrock123 Apr 19, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

npm patches almost always have a very clear either "good" or "oops broken" state

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Fishrock123 are CTCs able to merge the pull request of non-CTC collaborator?

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.

Expand Down
1 change: 1 addition & 0 deletions doc/onboarding.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down