From 9bc06ca46773ff9ad7e78c0a271d521824522266 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:46:43 +0200 Subject: [PATCH] Update doc/devel/pr_guide.rst Co-authored-by: Thomas A Caswell --- doc/devel/pr_guide.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/devel/pr_guide.rst b/doc/devel/pr_guide.rst index 3529fc8e8723..778d7b3c57bd 100644 --- a/doc/devel/pr_guide.rst +++ b/doc/devel/pr_guide.rst @@ -212,10 +212,9 @@ Some explicit rules following from this: the flow of championed PRs reasonable. After giving the last required approval, the author of the approval should -merge the PR. PR authors must not self-merge, except for when another reviewer +merge the PR. PR authors should not self-merge except for when another reviewer explicitly allows it (e.g., "Approve modulo CI passing, may self merge when green", or "Take or leave the comments. You may self merge".). -Core developers may also self-merge in exceptional emergency situations. .. _pr-automated-tests: