From c9b1f988a5f29458c8d7fe49eb430b73d798ee02 Mon Sep 17 00:00:00 2001 From: Akuli Date: Tue, 30 Mar 2021 20:02:32 +0300 Subject: [PATCH] CONTRIBUTING.md: core developer --> maintainer (#5157) * CONTRIBUTING.md: core developer --> maintainer --- CONTRIBUTING.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index af40b286d..403e7ac6e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,8 +62,8 @@ you if you've contributed to other projects on GitHub. For the mechanics, see [Mypy's git and GitHub workflow help page](https://github.com/python/mypy/wiki/Using-Git-And-GitHub), or [GitHub's own documentation](https://help.github.com/articles/using-pull-requests/). -Anyone interested in type stubs may review your code. One of the core -developers will merge your pull request when they think it's ready. +Anyone interested in type stubs may review your code. One of the +maintainers will merge your pull request when they think it's ready. For every pull request, we aim to promptly either merge it or say why it's not yet ready; if you go a few days without a reply, please feel free to ping the thread by adding a new comment. @@ -77,7 +77,7 @@ you are changing. Also, do not squash your commits after you have submitted a pull request, as this erases context during review. We will squash commits when the pull request is merged. -At present the core developers are (alphabetically): +At present the maintainers are (alphabetically): * Aku Viljanen (@Akuli) * David Fisher (@ddfisher) * Łukasz Langa (@ambv) @@ -92,7 +92,7 @@ At present the core developers are (alphabetically): * Jelle Zijlstra (@JelleZijlstra) NOTE: the process for preparing and submitting changes also applies to -core developers. This ensures high quality contributions and keeps +maintainers. This ensures high quality contributions and keeps everybody on the same page. Avoid direct pushes to the repository. @@ -384,13 +384,13 @@ addressed. We indicate this by editing the subject to add a ``[WIP]`` prefix. (This should be removed before committing the issue once unblocked!) -### Core developer guidelines +### Maintainer guidelines -Core developers should follow these rules when processing pull requests: +Maintainers should follow these rules when processing pull requests: * Always wait for tests to pass before merging PRs. * Use "[Squash and merge](https://github.com/blog/2141-squash-your-commits)" to merge PRs. -* Delete branches for merged PRs (by core devs pushing to the main repo). +* Delete branches for merged PRs (by maintainers pushing to the main repo). * Make sure commit messages to master are meaningful. For example, remove irrelevant intermediate commit messages. * If stubs for a new library are submitted, notify the library's maintainers.