fix: resolve merge conflicts for file_search attributes backport #4689

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

Open

are-ces wants to merge 1 commit into llamastack:mergify/bp/release-0.3.x/pr-4680 from are-ces:fix-conflicts-mergify-4680

Open

fix: resolve merge conflicts for file_search attributes backport #4689

fix: resolve merge conflicts for file_search attributes backport

Mergify / Summary succeeded Jan 22, 2026 in 0s

1 rule matches and 1 potential rule

Rule: ping author on conflicts and add 'needs-rebase' label (comment, label)

conflict
-closed

✅ Rule: remove 'needs-rebase' label when conflict is resolved (label)

-closed
-conflict

💖 Mergify is proud to provide this service for free to open source projects.

🚀 You can help us by becoming a sponsor!

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

@Mergifyio refresh will re-evaluate the rules
@Mergifyio rebase will rebase this PR on its base branch
@Mergifyio update will merge the base branch into this PR
@Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

look at your merge queues
generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

View more details on Mergify