summaryrefslogtreecommitdiff
path: root/docs/development
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2021-02-11 22:15:39 -0500
committerGitHub <noreply@github.com>2021-02-11 21:15:39 -0600
commitcfd079a0343f0d23c923786779efa4b7d878c389 (patch)
tree2bcd291f6dbb82600c05ff348319ee63d5742e6c /docs/development
parent250b992d37fb64fb4b9a0373d4e307e58beb37ce (diff)
downloadcryptography-cfd079a0343f0d23c923786779efa4b7d878c389.tar.gz
Updates for our new main branch (#5818)
Diffstat (limited to 'docs/development')
-rw-r--r--docs/development/reviewing-patches.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/development/reviewing-patches.rst b/docs/development/reviewing-patches.rst
index 084461830..d3d66482a 100644
--- a/docs/development/reviewing-patches.rst
+++ b/docs/development/reviewing-patches.rst
@@ -41,15 +41,15 @@ Merge requirements
Because cryptography is so complex, and the implications of getting it wrong so
devastating, ``cryptography`` has a strict merge policy for committers:
-* Patches must *never* be pushed directly to ``master``, all changes (even the
+* Patches must *never* be pushed directly to ``main``, all changes (even the
most trivial typo fixes!) must be submitted as a pull request.
* A committer may *never* merge their own pull request, a second party must
merge their changes. If multiple people work on a pull request, it must be
merged by someone who did not work on it.
* A patch that breaks tests, or introduces regressions by changing or removing
existing tests should not be merged. Tests must always be passing on
- ``master``.
-* If somehow the tests get into a failing state on ``master`` (such as by a
+ ``main``.
+* If somehow the tests get into a failing state on ``main`` (such as by a
backwards incompatible release of a dependency) no pull requests may be
merged until this is rectified.
* All merged patches must have 100% test coverage.