Skip to content

Commit

Permalink
Merge pull request #2348 from Kodiologist/merge-policy-release
Browse files Browse the repository at this point in the history
Remove exception to the merge policy for releases
  • Loading branch information
Kodiologist committed Nov 3, 2022
2 parents 6a3c2a9 + d1a1252 commit b107100
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions CONTRIBUTING.rst
Expand Up @@ -120,9 +120,7 @@ There are two situations in which a PR is allowed to be merged:
author. Changes to the documentation, or trivial changes to code, need only
**one** approving member.
2. When the PR is at least **three days** old and **no** member of the Hy core
team has expressed disapproval of the PR in its current state. (Exception: a
PR to create a new release is not eligible to be merged under this criterion,
only the first one.)
team has expressed disapproval of the PR in its current state.

Anybody on the Hy core team may perform the merge. Merging should create a merge
commit (don't squash unnecessarily, because that would remove separation between
Expand Down

0 comments on commit b107100

Please sign in to comment.