chore(asf): require conversation resolution before merge#4660
Merged
Yicong-Huang merged 2 commits intoMay 2, 2026
Merged
Conversation
Block merging when any PR review thread is unresolved. Closes apache#4659. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 task
Yicong-Huang
added
the
release/v1.1.0-incubating
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #4660 +/- ##
=======================================
Coverage ? 67.73%
=======================================
Files ? 176
Lines ? 11557
Branches ? 0
=======================================
Hits ? 7828
Misses ? 3729
Partials ? 0
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
github-actions Bot
pushed a commit
that referenced
this pull request
May 2, 2026
### What changes were proposed in this PR?
Add `required_conversation_resolution: true` to the `main` branch
protection block in `.asf.yaml`.
```diff
required_linear_history: true
+ required_conversation_resolution: true
```
This is a passthrough to GitHub's branch-protection API and will be
synced by ASF INFRA's `.asf.yaml` bot.
**Effect** — PR review threads must be marked Resolved before merging.
The approval flow is unchanged (1 approving review still required, no
stale dismissal). Comment-style reviews remain non-blocking by
themselves, but any inline conversation they create is gated.
**Why** — Today only "Approve" / "Request changes" gate merging; inline
comments and Copilot review feedback do not. This change makes reviewer
feedback explicitly addressable before merge, matching the practice of
40 other Apache repositories (airflow, pulsar, log4j2, cloudberry,
fineract, ignite-3, nuttx, etc.).
### Any related issues, documentation, discussions?
Closes #4659.
ASF INFRA `.asf.yaml` features:
https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features
### How was this PR tested?
This is a configuration change — no automated tests apply. Verification
plan:
1. After merge, ASF INFRA bot syncs `.asf.yaml` to GitHub branch
protection on `main`.
2. Open a follow-up PR with an unresolved inline comment and confirm the
merge button is blocked until the thread is resolved.
3. Approve flow regression — confirm a PR with 1 approval and all
conversations resolved still merges.
### Was this PR authored or co-authored using generative AI tooling?
Generated-by: Claude Code (Opus 4.7, 1M context)
(backported from commit d3d17b0)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this PR?
Add
required_conversation_resolution: trueto themainbranch protection block in.asf.yaml.required_linear_history: true + required_conversation_resolution: trueThis is a passthrough to GitHub's branch-protection API and will be synced by ASF INFRA's
.asf.yamlbot.Effect — PR review threads must be marked Resolved before merging. The approval flow is unchanged (1 approving review still required, no stale dismissal). Comment-style reviews remain non-blocking by themselves, but any inline conversation they create is gated.
Why — Today only "Approve" / "Request changes" gate merging; inline comments and Copilot review feedback do not. This change makes reviewer feedback explicitly addressable before merge, matching the practice of 40 other Apache repositories (airflow, pulsar, log4j2, cloudberry, fineract, ignite-3, nuttx, etc.).
Any related issues, documentation, discussions?
Closes #4659.
ASF INFRA
.asf.yamlfeatures: https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+featuresHow was this PR tested?
This is a configuration change — no automated tests apply. Verification plan:
.asf.yamlto GitHub branch protection onmain.Was this PR authored or co-authored using generative AI tooling?
Generated-by: Claude Code (Opus 4.7, 1M context)