Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Update libc version required by rustc #56562
This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.
How do I rebase?
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.
Please avoid the "Resolve conflicts" button on GitHub. It uses
Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how
The version update commit is easy to cherry-pick on its own.
There was a conflict with PR #56666 because that also touched
I assume though that we are not planning on backporting #56666. Therefore:
Whomever does do a backport of this PR (#56562), if such a backport is done at all, should make sure to actually commit any update to the
Dec 12, 2018