Skip to content

agents: comment superseding PR when closing duplicate Dependabot PRs #4338

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
rickeylev merged 2 commits into from
Oct 23, 2026
Merged

agents: comment superseding PR when closing duplicate Dependabot PRs #4338

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45d5013
agents: comment superseding PR when closing duplicate Dependabot PRs
rickeylev Oct 23, 2026
3e755ee
Merge remote-tracking branch 'upstream/main' into process_dependabot_…
rickeylev Oct 23, 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
15 changes: 11 additions & 4 deletions .agents/skills/process-dependabot-prs/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,20 @@ Classify each PR as **OK**, **OK (with trivial fixes)**, or **Problematic**:

Once the user confirms:

1. **Handle Conflicts or Stale Branches**:
1. **Close Duplicate or Superseded PRs**:
- When closing/skipping a duplicate or superseded PR, close it and post a
comment noting which PR supersedes it:
```bash
gh pr close <pr_number> --repo bazel-contrib/rules_python \
--comment "Superseded by #<superseding_pr_number>."
```
2. **Handle Conflicts or Stale Branches**:
- If a pure Dependabot PR has merge conflicts after another PR merges, run:
```bash
gh pr comment <pr_number> --repo bazel-contrib/rules_python \
--body "@dependabot recreate"
```
2. **Fix Trivial Failures (When Needed)**:
3. **Fix Trivial Failures (When Needed)**:
- Fetch and check out the PR branch:
```bash
git fetch upstream <headRefName>
Expand All @@ -115,11 +122,11 @@ Once the user confirms:
```bash
git push upstream HEAD:<headRefName>
```
3. **Approve the PR**:
4. **Approve the PR**:
```bash
gh pr review <pr_number> --repo bazel-contrib/rules_python --approve
```
4. **Merge Using `merge-pr`**:
5. **Merge Using `merge-pr`**:
- Follow [merge-pr](../merge-pr/SKILL.md) to enqueue the PR (`gh pr merge
<pr_number> --repo bazel-contrib/rules_python --auto --squash`) and launch
a `Merge PR Shepherd` subagent to monitor CI, retry flakes, and track the
Expand Down
Loading