Skip to content

fix(skill-evals): correct blocked drop reason - #1061

Open
apraba05 wants to merge 1 commit into
apache:mainfrom
apraba05:fix/949-quick-merge-drop-reason
Open

fix(skill-evals): correct blocked drop reason#1061
apraba05 wants to merge 1 commit into
apache:mainfrom
apraba05:fix/949-quick-merge-drop-reason

Conversation

@apraba05

@apraba05 apraba05 commented Aug 2, 2026

Copy link
Copy Markdown

Summary

  • Correct mergeable-but-blocked, non-review drops from gate:G5-conflict to gate:G5, matching the authoritative candidate rules.
  • Add a regression fixture that keeps gate:G5-conflict reserved for genuine merge conflicts.
  • Update the quick-merge suite documentation and case count.

Type of change

  • Other: skill-eval fixture and behavioral prompt correction

Test plan

  • uv run --project tools/skill-evals pytest tools/skill-evals/tests -q passes
  • The affected quick-merge stage-3 fixture suite was exercised successfully
  • A new regression fixture is included for the corrected behavior
  • Targeted prek and commit-time hooks pass
  • prek run --all-files passes (the local one-vCPU runner exceeded its bounded execution window; CI will run the full repository gates)

Linked issues

Closes #949

Notes for reviewers

The new case isolates mergeable=true, mergeable_state=blocked, and reviewDecision=APPROVED. The prior fixture text mislabeled this non-conflict state as gate:G5-conflict; gate:G5 is the existing non-approval blocker code.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Fix the drop_reason mismatch in the quick-merge stage-3 fixture

1 participant