Skip to content
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

Fix tracking issue for waker_getters #16132

Closed
wants to merge 2 commits into from
Closed

Fix tracking issue for waker_getters #16132

wants to merge 2 commits into from

Conversation

tvallotton
Copy link
Contributor

@tvallotton tvallotton commented Dec 15, 2023

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.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. has-merge-commits S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 15, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 15, 2023

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:

$ # rebase
$ git rebase -i master
$ # delete any merge commits in the editor that appears
$ git push --force-with-lease

The following commits are merge commits:

@tvallotton tvallotton closed this Dec 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
has-merge-commits S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants