Uh oh!
There was an error while loading. Please reload this page.
Rollup of 21 pull requests - #52902
Conversation
Mark-Simulacrum
commented
Jul 31, 2018
@bors r+ p=5 |
bors
commented
Jul 31, 2018
📌 Commit 4a183318e89016c264323caed9628c35cd14b76a has been approved by |
bors
commented
Jul 31, 2018
🔒 Merge conflict 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?Assuming
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 Error message |
Successful merges:
curlin bootstrap.py. #52846 (Add timeout to use ofcurlin bootstrap.py.)Failed merges:
r? @ghost