Skip to content

Commit

Permalink
doc: update collaborator guide to reflect TSC changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Trott committed Mar 16, 2023
1 parent 874095e commit 79a444d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions doc/contributing/collaborator-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,8 @@ For undocumented APIs that are public, open a pull request documenting the API.

### Breaking changes

At least two TSC members must approve backward-incompatible changes to the
`main` branch.
At least two TSC voting members must approve backward-incompatible changes to
the `main` branch.

Examples of breaking changes include:

Expand Down Expand Up @@ -411,7 +411,7 @@ possible to avoid confusion and typosquatting attacks.
For pull requests introducing new core modules:

* Allow at least one week for review.
* Land only after sign-off from at least two TSC members.
* Land only after sign-off from at least two TSC voting members.
* Land with a [Stability Index][] of Experimental. The module must remain
Experimental until a semver-major release.

Expand Down Expand Up @@ -742,7 +742,7 @@ git push upstream main

### I made a mistake

* Ping a TSC member.
* Ping a TSC voting member.
* With `git`, there's a way to override remote trees by force pushing
(`git push -f`). This is generally forbidden as it creates conflicts in other
people's forks. It is permissible for simpler slip-ups such as typos in commit
Expand Down

0 comments on commit 79a444d

Please sign in to comment.