Skip to content

Enable triagebot's merge conflict notifications #14508

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.

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
merged 1 commit into from
Mar 31, 2025

Conversation

Alexendoo
Copy link
Member

Since we migrated away from bors I've missed this feature, fortunately triagebot supports it too - https://forge.rust-lang.org/triagebot/merge-conflicts.html

r? @flip1995

changelog: none

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Mar 31, 2025
@samueltardieu
Copy link
Contributor

Oh great, I had written my own script to check for my PR mergeability and send a notice via Telegram, but having it through triagebot is much better!

@flip1995 flip1995 added this pull request to the merge queue Mar 31, 2025
@flip1995
Copy link
Member

Oh nice, thanks!

Merged via the queue into rust-lang:master with commit 6366e31 Mar 31, 2025
11 checks passed
@Alexendoo Alexendoo deleted the merge-conflict-notifications branch March 31, 2025 23:23
@samueltardieu
Copy link
Contributor

Well… it works, as a simple merge which fixes the Clippy version for a lint triggered a mass check… and ~80 PRs were flagged by triagebot as non-mergeable and got a message!

@flip1995
Copy link
Member

flip1995 commented Apr 1, 2025

That explains my 80+ Clippy notifications

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants