[CI] Fix merge conflict #9317
Merged
[CI] Fix merge conflict #9317
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
👋 Hi! Thank you for contributing to the vLLM project. Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging. To run CI, PR reviewers can do one of these:
🚀 |
LiuXiaoxuanPKU
requested review from
DarkLight1337,
comaniac,
khluu and
tlrmchlsmth
LiuXiaoxuanPKU
added
the
ready
comaniac
approved these changes
Oct 13, 2024
Alvant
pushed a commit
to compressa-ai/vllm
that referenced
this pull request
Oct 26, 2024
Signed-off-by: Alvant <[email protected]>
garg-amit
pushed a commit
to garg-amit/vllm
that referenced
this pull request
Oct 28, 2024
Signed-off-by: Amit Garg <[email protected]>
sumitd2
pushed a commit
to sumitd2/vllm
that referenced
this pull request
Nov 14, 2024
Signed-off-by: Sumit Dubey <[email protected]>
LeiWang1999
pushed a commit
to LeiWang1999/vllm-bitblas
that referenced
this pull request
Mar 26, 2025
Signed-off-by: LeiWang1999 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There is a conflict between #6484 and #9298, which causes the CI to fail as shown here. Fix the merge conflict in field
max_decode_query_len.