From d1a125239140ac856a35e7c0efd5efc5bc234fbe Mon Sep 17 00:00:00 2001 From: Kodi Arfer Date: Thu, 27 Oct 2022 15:59:31 -0400 Subject: [PATCH] Remove exception to the merge policy for releases --- CONTRIBUTING.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index b26b6d5ec..2a1c10d78 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -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