Skip to content

fix introduced merge conflict on main #345

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
Jul 29, 2025
Merged

fix introduced merge conflict on main #345

merged 1 commit into from
Jul 29, 2025

Conversation

yannicks1
Copy link
Collaborator

fix introduced merge conflict on main

Signed-off-by: Yannick Schnider <[email protected]>
Copy link

👋 Hi! Thank you for contributing to vLLM support on Spyre.
Just a reminder: Make sure that your code passes all the linting checks, otherwise your PR won't be able to be merged. To do so, first install the linting requirements, then run format.sh and commit the changes. This can be done with uv directly:

uv sync --frozen --group lint --active --inexact

Or this can be done with pip:

uv pip compile --group lint > requirements-lint.txt
pip install -r requirements-lint.txt
bash format.sh

Now you are good to go 🚀

@yannicks1 yannicks1 enabled auto-merge (squash) July 29, 2025 14:49
@yannicks1 yannicks1 requested a review from joerunde July 29, 2025 14:49
@github-actions github-actions bot added the ready label Jul 29, 2025
Copy link
Collaborator

@wallashss wallashss left a comment

Choose a reason for hiding this comment

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

Thanks for the fix

Copy link
Collaborator

@joerunde joerunde left a comment

Choose a reason for hiding this comment

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

😎

@yannicks1 yannicks1 merged commit dd8d6e7 into main Jul 29, 2025
17 of 20 checks passed
@yannicks1 yannicks1 deleted the ysc-fix-main branch July 29, 2025 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants