Fix tracking issue for waker_getters#16132
Closed
tvallotton wants to merge 2 commits intorust-lang:masterfrom
tvallotton:master
Closed
Fix tracking issue for waker_getters#16132tvallotton wants to merge 2 commits intorust-lang:masterfrom tvallotton:master
tvallotton wants to merge 2 commits intorust-lang:masterfrom
tvallotton:master
Conversation
Collaborator
|
There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged. You can start a rebase with the following commands: The following commits are merge commits: |
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
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.
I was directed by this rustbot at rust-lang/rust#118960 (comment) to apply the fix in this repository instead of rust-lang/rust directly.