Skip to content

ci: add needs-rebase label management to Mergify #427

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
CatherineSue merged 2 commits into from
Feb 13, 2026
Merged

ci: add needs-rebase label management to Mergify #427

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e5999e
ci: add needs-rebase label management to Mergify
CatherineSue Feb 13, 2026
9764b04
fix(ci): only evaluate needs-rebase removal when label is present
CatherineSue Feb 13, 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
18 changes: 16 additions & 2 deletions .github/mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,16 @@ pull_request_rules:
- **VSCode**: enable `Git: Always Sign Off` in Settings
- **PyCharm**: enable `Sign-off commit` in the Commit tool window

- name: Notify on merge conflicts
description: Comment when a PR has merge conflicts
- name: Add needs-rebase label and comment on merge conflicts
description: Label and comment when a PR has merge conflicts
conditions:
- conflict
- -closed
- -draft
actions:
label:
add:
- needs-rebase
comment:
message: |
Hi @{{author}}, this PR has merge conflicts that must be resolved before it can be merged. Please rebase your branch:
Expand All @@ -65,6 +68,17 @@ pull_request_rules:
git push --force-with-lease
```

- name: Remove needs-rebase label when conflict is resolved
description: Remove needs-rebase label when PR no longer has conflicts
conditions:
- -conflict
- -closed
Comment thread
CatherineSue marked this conversation as resolved.
- label = needs-rebase
actions:
label:
remove:
- needs-rebase

Comment thread
coderabbitai[bot] marked this conversation as resolved.
- name: Remind on stale PRs
description: Comment and label PRs inactive for 14 days
conditions:
Expand Down
Loading