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

Rollup of 21 pull requests #52902

Closed
wants to merge 0 commits into from

Conversation

Mark-Simulacrum
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=5

@bors
Copy link
Contributor

bors commented Jul 31, 2018

📌 Commit 4a183318e89016c264323caed9628c35cd14b76a has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 31, 2018
@bors
Copy link
Contributor

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 self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rollup (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rollup --force-with-lease (update this PR)

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 git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
warning: Cannot merge binary files: src/Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/test/ui/nll/issue-52113.stderr
Auto-merging src/rustllvm/PassWrapper.cpp
Removing src/libstd_unicode/lib.rs
Removing src/libstd_unicode/Cargo.toml
Auto-merging src/librustc_codegen_llvm/mir/rvalue.rs
Auto-merging src/librustc_codegen_llvm/mir/mod.rs
CONFLICT (content): Merge conflict in src/librustc_codegen_llvm/mir/mod.rs
Auto-merging src/librustc_codegen_llvm/mir/analyze.rs
CONFLICT (content): Merge conflict in src/librustc_codegen_llvm/mir/analyze.rs
Auto-merging src/librustc_codegen_llvm/intrinsic.rs
Auto-merging src/librustc_codegen_llvm/debuginfo/mod.rs
CONFLICT (content): Merge conflict in src/librustc_codegen_llvm/debuginfo/mod.rs
Auto-merging src/librustc_codegen_llvm/debuginfo/gdb.rs
CONFLICT (content): Merge conflict in src/librustc_codegen_llvm/debuginfo/gdb.rs
Auto-merging src/librustc_codegen_llvm/debuginfo/create_scope_map.rs
CONFLICT (content): Merge conflict in src/librustc_codegen_llvm/debuginfo/create_scope_map.rs
Auto-merging src/librustc_codegen_llvm/context.rs
CONFLICT (content): Merge conflict in src/librustc_codegen_llvm/context.rs
Auto-merging src/librustc_codegen_llvm/callee.rs
Auto-merging src/librustc_codegen_llvm/base.rs
Auto-merging src/librustc_codegen_llvm/back/write.rs
Auto-merging src/librustc_codegen_llvm/back/lto.rs
Auto-merging src/Cargo.lock
CONFLICT (content): Merge conflict in src/Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 31, 2018
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants