mergify: add auto-rebase and conflict notification rules

[LalatenduMohanty]

Add two new Mergify rules:

• Auto-rebase approved PRs that are behind main, eliminating the need to manually comment "@mergify rebase"
• Notify PR authors when merge conflicts are detected

[coderabbitai]

Warning

Rate limit exceeded

@LalatenduMohanty has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 52 minutes and 59 seconds before requesting another review.

Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 52 minutes and 59 seconds.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 9e22c715-42f9-4983-aeac-3709d8779ab6

📥 Commits

Reviewing files that changed from the base of the PR and between 75b28f8 and 2b32364.

📒 Files selected for processing (1)

• .mergify.yml

📝 Walkthrough

Walkthrough

This PR introduces two new Mergify automation rules to .mergify.yml. The first rule automatically rebases and updates non-draft pull requests targeting main that have at least one approval, are not in conflict, and are not up-to-date. The second rule detects when a PR enters conflict state and posts a comment requesting the author to resolve conflicts via rebase. No existing rules were modified.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

🚥 Pre-merge checks | ✅ 2

✅ Passed checks (2 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly and specifically summarizes the main changes: adding two new Mergify rules for auto-rebase and conflict notification.
Description check	✅ Passed	The description directly relates to the changeset, providing clear context for both new Mergify rules being added.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

---

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.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[coderabbitai]

🧹 Nitpick comments (1)

.mergify.yml (1)

93-95: Consider scoping conflict notifications to main only.

This avoids comment noise if the repo later introduces release/support branches.

Suggested diff

   - name: Ping author on conflicts
     conditions:
       - "conflict"
       - "-closed"
+      - "base=main"

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In @.mergify.yml around lines 93 - 95, The current mergify rule triggers on any
branch conflict; scope these notifications to the main branch by adding a
base=main condition to the conditions list so the rule only matches when the PR
target is main (adjust the conditions array that contains "conflict" and
"-closed" to include "base=main" alongside them).

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Nitpick comments:
In @.mergify.yml:
- Around line 93-95: The current mergify rule triggers on any branch conflict;
scope these notifications to the main branch by adding a base=main condition to
the conditions list so the rule only matches when the PR target is main (adjust
the conditions array that contains "conflict" and "-closed" to include
"base=main" alongside them).

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 469f18b2-cba4-4681-9af2-7d295d8b1de6

📥 Commits

Reviewing files that changed from the base of the PR and between 2376129 and 75b28f8.

📒 Files selected for processing (1)

• .mergify.yml

[rd4398]

LGTM!

[rd4398]

LGTM!