Skip to content

Fix merge conflict detection in pr-review-needed workflow #13884

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
radical merged 3 commits into from
Jan 13, 2026
Merged

Fix merge conflict detection in pr-review-needed workflow #13884

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b774d10
Initial plan
Copilot Jan 13, 2026
4d3aa56
Fix merge conflict detection by fetching individual PR details
Copilot Jan 13, 2026
34f00bd
Improve merge conflict detection to handle all mergeable states
Copilot Jan 13, 2026
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
19 changes: 18 additions & 1 deletion .github/workflows/pr-review-needed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,25 @@ jobs:
continue;
}

// Fetch the full PR details to get mergeable_state (not available in list endpoint)
const { data: fullPr } = await github.rest.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: pr.number
});

// Check if PR has merge conflicts
const hasMergeConflict = pr.mergeable_state === 'dirty';
// mergeable_state can be: clean, dirty, blocked, behind, unstable, unknown, or null
// - 'dirty' definitely means conflicts
// - mergeable === false + not blocked/behind/unstable also likely means conflicts
// - blocked/behind/unstable mean the PR can't merge due to other reasons (checks, needs update, etc.)
const hasMergeConflict = fullPr.mergeable_state === 'dirty' ||
(fullPr.mergeable === false &&
fullPr.mergeable_state !== 'blocked' &&
fullPr.mergeable_state !== 'behind' &&
fullPr.mergeable_state !== 'unstable' &&
fullPr.mergeable_state !== 'unknown' &&
fullPr.mergeable_state !== 'clean');

// Get reviews to check if PR is approved
const reviews = await getAllPages(github.rest.pulls.listReviews, {
Expand Down