Fix #4565 #4595
Merged
Fix #4565 #4595
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
lpil
approved these changes
May 14, 2025
|
is this right? 😭 sorry |
cysabi
force-pushed
the
main
branch
2 times, most recently
from
3a7ee23 to
fb732bd
Compare
|
so when i resolve the merge conflict, it makes the no merge commits test fail |
|
Yup we don't permit merge commits so you'll need to rebase your branch on main to get it up-to-date. If this isn't something you can do let me know and we can figure something out. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
visit.rs(where it is now) or as an override inQualifiedToUnqualifiedImportFirstPass