Add merge conflict detection for pull requests#12
Merged
Conversation
When a PR has merge conflicts, GitHub doesn't run workflows, but cimonitor previously didn't report this. Now cimonitor detects and reports merge conflicts using the GitHub API's mergeable state. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
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
1 participant
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.
Fixes the UX issue where cimonitor doesn't report when PRs have merge conflicts vs the main branch, which prevents workflows from running.
The implementation uses GitHub's API to check the
mergeableandmergeable_statefields to detect when PRs have conflicts or other blocking conditions, and displays clear messages explaining why workflows aren't running.🤖 Generated with Claude Code