Skip to content

ci(Mergify): configuration update #331

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
twisti-dev merged 1 commit into from
May 1, 2026
Merged

ci(Mergify): configuration update #331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 28 additions & 0 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
pull_request_rules:
- name: Make sure PR are update before merging with rebase
Copy link

Copilot AI May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grammar: update the rule name to use correct pluralization/verb form (e.g., "Make sure PRs are updated before merging with rebase").

Suggested change
- name: Make sure PR are update before merging with rebase
- name: Make sure PRs are updated before merging with rebase

Copilot uses AI. Check for mistakes.
description: This automatically rebases PRs when they are out-of-date with the
base branch to avoid semantic conflicts (next step us switch to merge
Copy link

Copilot AI May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo in description: "next step us switch" should be "next step is to switch".

Suggested change
base branch to avoid semantic conflicts (next step us switch to merge
base branch to avoid semantic conflicts (next step is to switch to merge

Copilot uses AI. Check for mistakes.
queue).
Comment on lines +2 to +5
Copy link

Copilot AI May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rule description says PRs are rebased when they are out-of-date with the base branch, but the condition only triggers when #commits-behind >= 10. Either lower the threshold (e.g., > 0) or update the description so it matches the actual behavior.

Suggested change
- name: Make sure PR are update before merging with rebase
description: This automatically rebases PRs when they are out-of-date with the
base branch to avoid semantic conflicts (next step us switch to merge
queue).
- name: Rebase PRs when they are 10 or more commits behind
description: This automatically rebases PRs when they are 10 or more
commits behind the base branch to avoid semantic conflicts (next step
us switch to merge queue).

Copilot uses AI. Check for mistakes.
conditions:
- "#commits-behind >= 10"
actions:
rebase:
Copy link

Copilot AI May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actions.rebase is declared without a value (rebase:), which parses as null in YAML. Use an explicit empty mapping (or provide required keys) to avoid Mergify config validation/runtime errors.

Suggested change
rebase:
rebase: {}

Copilot uses AI. Check for mistakes.
- name: Label conflicting pull requests
description: Add a label to a pull request with conflict to spot it easily
conditions:
- conflict
- -closed
actions:
label:
toggle:
- conflict
- name: Ping PR author when conflicting
description: Warn the pull request author when their PR are conflicting
Copy link

Copilot AI May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grammar: "their PR are conflicting" should be "their PR is conflicting" (or "their PRs are conflicting").

Suggested change
description: Warn the pull request author when their PR are conflicting
description: Warn the pull request author when their PR is conflicting

Copilot uses AI. Check for mistakes.
conditions:
- conflict
- -closed
actions:
comment:
message: >
👋 {{author}} your PR is conflicting and needs to be updated to be
merged