summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.rst
diff options
context:
space:
mode:
authorFloris Bruynooghe <flub@devork.be>2017-02-19 15:16:34 -0300
committerFloris Bruynooghe <flub@devork.be>2017-02-19 15:16:34 -0300
commit1f0d06641a3f0dbea673f1b2468c6a40da5861e1 (patch)
treedcc08b46bba9856efb9c08a3cc5bbc103722ea0c /CONTRIBUTING.rst
parent4c62cd451a44959f3f2ce3b55f94e4dff9ab0f94 (diff)
downloadpytest-1f0d06641a3f0dbea673f1b2468c6a40da5861e1.tar.gz
Update text to only give access when wanted
Also clarify merging perms given the PR approval now available.
Diffstat (limited to 'CONTRIBUTING.rst')
-rw-r--r--CONTRIBUTING.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index d8f806be6..42c9f645b 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -241,10 +241,10 @@ Joining the Development Team
Anyone who has successfully seen through a pull request which did not
require any extra work from the development team to merge will
-themselves gain commit access (if we forget please send a friendly
+themselves gain commit access if they so wish (if we forget to ask please send a friendly
reminder). This does not mean your workflow to contribute changes,
everyone goes through the same pull-request-and-review process and
-no-one merges their own pull requests. It however means you can
+no-one merges their own pull requests unless already approved. It does however mean you can
participate in the development process more fully since you can merge
pull requests from other contributors yourself after having reviewed
them.