Skip to content

fix(label-pr-review-state): detect merge conflicts and label PRs with has-conflicts #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edelauna merged 1 commit into from
Jul 4, 2026
Merged

fix(label-pr-review-state): detect merge conflicts and label PRs with has-conflicts #269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion .github/workflows/label-pr-review-state.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
with:
script: |
const { owner, repo } = context.repo;
const stateLabels = ['awaiting-author', 'awaiting-review'];
const stateLabels = ['awaiting-author', 'awaiting-review', 'has-conflicts'];

// When triggered by a single PR event, only reconcile that PR.
// The hourly schedule and workflow_dispatch reconcile all open PRs.
Expand Down Expand Up @@ -125,6 +125,22 @@ jobs:
continue;
}

// `mergeable`/`mergeable_state` are only returned by the single-PR GET
// endpoint, and are computed asynchronously by GitHub — a PR fetched via
// pulls.list (schedule/workflow_dispatch runs) never has them, and even a
// single-PR fetch can return `null`/"unknown" if the merge check hasn't
// finished yet. Re-fetch the single PR to get a fresh value, and treat
// "unknown" as not-yet-computed rather than as conflicting.
const prDetail = prNumber
? pr
: (await github.rest.pulls.get({ owner, repo, pull_number: pr.number })).data;

if (prDetail.mergeable === false && prDetail.mergeable_state === 'dirty') {
core.info(`PR #${pr.number}: has merge conflicts — labeling has-conflicts`);
await reconcileLabels(pr, 'has-conflicts');
continue;
}

// Check CI status for required checks on the PR's head commit only.
// Scoping to required checks avoids advisory checks (e.g. codecov/patch)
// incorrectly blocking label assignment on otherwise-ready PRs.
Expand Down
Loading