fix: use 'mergeable' field for PR conflict detection#143
Merged
Conversation
…ict detection The GitHub API was returning "DIRTY" in the mergeStateStatus field for PRs with merge conflicts, but the code was checking for "CONFLICTING". GitHub has two separate fields: - mergeStateStatus: returns "DIRTY", "CLEAN", "UNSTABLE", etc. - mergeable: returns "CONFLICTING", "MERGEABLE", "UNKNOWN" Updated all GitHub CLI queries to use the 'mergeable' field instead of 'mergeStateStatus' to correctly detect merge conflicts. This fixes the issue where tasks with PRs that have merge conflicts were not showing the conflict indicator (red "C" badge with "Has conflicts" text). Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
|
Looks like there are a few issues preventing this PR from being merged!
If you'd like me to help, just leave a comment, like Feel free to include any additional details that might help me get this PR into a better state. You can manage your notification settings |
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
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.
Summary
Problem
The merge conflict detection feature was implemented but not working because:
mergeStateStatusfield (returns "DIRTY", "CLEAN", etc.)"CONFLICTING"(which only appears in themergeablefield)Solution
Updated all GitHub CLI queries to use the
mergeablefield instead ofmergeStateStatus:gh pr viewgh pr list(both open and merged)Testing
gh pr viewnow returns"mergeable":"CONFLICTING"Changes
File:
internal/github/pr.goghPRResponsestruct to useMergeablefieldghPRListResponsestruct to useMergeablefieldmergeableinstead ofmergeStateStatusresp.Mergeableinstead ofresp.MergeStateStatusUser Impact
Users will now see:
🤖 Generated with Claude Code