PR Merge Conflict Dashboard

PRs with merge conflicts are automatically labeled with merge-conflict and held for manual review before auto-merge can proceed.

View PRs Requiring Conflict Resolution

Use the GitHub CLI or web interface to view PRs currently blocked by merge conflicts:

Command Line

gh pr list --label "merge-conflict" --repo Cirius-Group-Inc/bedrock-docs

Web Interface

View all PRs with merge conflicts

Resolution Process

1. Check out the PR branch locally
2. Merge the base branch (usually main) into it
3. Resolve conflicts manually
4. Push the resolution
5. The workflow automatically removes the label once conflicts are resolved
6. Auto-merge proceeds once CI passes

Workflow Details

• Trigger: Runs on every PR open/sync and every 30 minutes
• Detection: Checks mergeable status via GitHub API
• Action: Adds merge-conflict label + instructional comment
• Resolution: Auto-removes label when conflict is resolved

Implementation

The merge conflict gate is implemented in .github/workflows/merge-conflict-gate.yml and works with the existing auto-merge workflow to ensure only cleanly mergeable PRs proceed to automatic merge.