feat: auto-close inactive merge-conflicted PRs#1289
Conversation
WalkthroughA new GitHub Actions workflow detects pull requests with merge conflicts and automatically manages their lifecycle based on inactivity. After 30 inactive days, contributors receive a warning; after 5 more inactive days without updates, the PR is automatically closed. Custom labels and messaging preserve the merge-conflict label meaning while guiding contributors to resolve conflicts or restart the stale timer. ChangesStale merge-conflict PR auto-closure
Estimated code review effort🎯 2 (Simple) | ⏱️ ~12 minutes Poem
🚥 Pre-merge checks | ✅ 4✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In @.github/workflows/stale-merge-conflicts.yml:
- Line 19: The workflow currently references the mutable tag "actions/stale@v10"
which must be pinned to a full 40-character commit SHA; update the uses entry
for the stale action (the line containing "uses: actions/stale@v10") to use the
corresponding full commit SHA (e.g., "actions/stale@<40-hex-sha>") so the action
is pinned to an exact commit, then commit the change to the workflow file.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 1e461acd-3a0a-40dd-b9d4-82af4c9686a0
📒 Files selected for processing (1)
.github/workflows/stale-merge-conflicts.yml
Addressed Issues:
Fixes #1279
Screenshots/Recordings:
N/A — this PR only adds a GitHub Actions workflow and does not include UI changes.
Additional Notes:
This PR adds a separate scheduled workflow for stale merge-conflicted PR cleanup. The existing merge conflict labeling workflow is left unchanged.
The new workflow only targets PRs with the
PR has merge conflictslabel, warns them after 30 days of inactivity, and closes them after 5 additional inactive days if there is still no activity.AI Usage Disclosure:
I have used the following AI models and tools: ChatGPT and Codex
Checklist
Summary by CodeRabbit