(magpie) branch main updated: chore(asf.yaml): require review threads to be resolved before merge (#1521)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/magpie.git


The following commit(s) were added to refs/heads/main by this push:
     new 62107382 chore(asf.yaml): require review threads to be resolved before merge (#1521)
62107382 is described below

commit 621073828b6ed1981d8c1ee416f90a4373a4cd2a
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Mon Oct 5 12:08:52 2026 +0200

    chore(asf.yaml): require review threads to be resolved before merge (#1521)
    
    With the approval requirement lifted on main, an unresolved review
    thread is the only remaining signal that a reviewer's point is still
    open, and nothing stopped a PR from merging past it. Turn
    required_conversation_resolution back on so every thread is answered
    (fixed by the author, or resolved by the reviewer when a nit is left
    as-is) before merge. The bootstrap-phase note above it already says
    threads must be resolved; this makes that true again.
    
    Generated-by: Claude Opus 5
---
 .asf.yaml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index bf23b1a2..3f024d80 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -185,19 +185,14 @@ github:
       # above — squash is the only enabled merge mode, so every
       # merge results in a single commit on top of main.
       required_linear_history: true
-      # Do NOT block merge on unresolved review threads. With the
-      # approval requirement lifted above, this was the one merge gate
-      # a reviewer could trip by accident: *any* open thread held the
-      # PR, including a nit the reviewer explicitly marked as
-      # non-blocking. The observed effect is reviewers resolving their
-      # own advisory comments purely to unblock the merge, which
-      # defeats the point of leaving the comment where the author can
-      # still see it. Unresolved threads remain visible in the PR UI;
-      # they are simply no longer a hard gate.
-      #
-      # Restore alongside `required_pull_request_reviews` above if the
-      # project later wants threads to gate merge again.
-      required_conversation_resolution: false
+      # Block merge until every review thread is resolved. With the
+      # approval requirement lifted above, an unresolved thread is the
+      # only signal left that a reviewer's point is still open, and
+      # nothing stopped a PR from merging past it. Resolving a thread
+      # is cheap — the author does it after pushing the fix, or the
+      # reviewer does when a nit is deliberately left as-is — and it
+      # makes "every point was answered" a gate rather than a hope.
+      required_conversation_resolution: true
       # Do NOT require signed commits. External contributors
       # without configured GPG/SSH signing would be unable to
       # contribute. Re-enable if/when the project adopts a