From 9b70c65f5d4d4c7ad9efe8ab6b834e941f9ac4bf Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Sat, 23 Mar 2024 07:27:42 +1100 Subject: [PATCH] Introduce new one-ack carve out rule Our merge process is being artificially slowed down because of a combination of: - Using merge-commit merging means PRs often have to be rebased with no changes but a different merge base (and force pushed). - Trivial changes, like fixing nits, are often force pushed also. - Force pushes invalidate ACKs - Our devs are spread around the world working at different times What this means is trivial force pushes often cause multi day delays in merging. To try and alleviate this problem introduce an additional rule to the One ACK carve-out so that Andrew can merge PRs that have previously been ack'ed by another dev and have only minimal changes. The definition of "trivial" is subjective which introduces a burden on Andrew to not merge stuff willy-nilly but also allows simple changes to the original PR (eg fixed nits that the original reviewer suggested). --- CONTRIBUTING.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e1a0bc65..722d22a9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -165,8 +165,17 @@ any of the following conditions: submodule and re-exporting them from the original module. Must not include any code changes except to import paths. Requires absolutely no change to the public API. +4. PR has previously had two ACKs, had minimal changes, and gets a single ACK + from Andrew. This call is subjective, gives extra privileges, but also + requires extra responsibility/accountability (including running a bunch + of local CI checks before merging) [1]. + + [0] - Obviously author and ACK'er must not be the same person. +[1] - The aim is to reduce the burden of re-ACK'ing trivial changes and also + alleviate the problem of devs spread around the world in different timezones. + ## Coding conventions