Add Nicholas Bishop to .mailmap#105074
Merged
bors merged 1 commit intorust-lang:masterfrom Dec 1, 2022
Merged
Conversation
Collaborator
|
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
A-meta
Member
|
@bors r+ rollup |
Collaborator
|
📌 Commit fcd1da599519c86f1e0791dab32c1512c5bc62be has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
Contributor
|
This is going to conflict with #105071 when a rollup is attempted because we both have the first name Nicholas 😞 |
Contributor
Author
|
It's a good first name :) I'll rebase once yours merges. |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 30, 2022
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#104697 (Restore control flow on error in EUV) - rust-lang#104811 (feat: implement TcpStream shutdown for wasm32-wasi) - rust-lang#105039 (Fix an ICE parsing a malformed literal in `concat_bytes!`.) - rust-lang#105071 (Add Nicholas Nethercote to `.mailmap`.) - rust-lang#105079 (Add bots to `.mailmap`) Failed merges: - rust-lang#105074 (Add Nicholas Bishop to `.mailmap`) r? `@ghost` `@rustbot` modify labels: rollup
Contributor
|
Let's take this out of the queue for now, to avoid problems for the rollup creators. @bors r- |
bors
added
S-waiting-on-author
Contributor
|
Ok, #105071 has been merged. |
Collaborator
|
☔ The latest upstream changes (presumably #105080) made this pull request unmergeable. Please resolve the merge conflicts. |
nicholasbishop
force-pushed
the
bishop-mailmap
branch
from
fcd1da5 to
f6e8580
Compare
Contributor
|
@bors r=Mark-Simulacrum |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 1, 2022
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#103065 (rustdoc-json: Document and Test that args can be patterns.) - rust-lang#104865 (Don't overwrite local changes when updating submodules) - rust-lang#104895 (Avoid Invalid code suggested when encountering unsatisfied trait bounds in derive macro code) - rust-lang#105063 (Rustdoc Json Tests: Don't assume that core::fmt::Debug will always have one item.) - rust-lang#105064 (rustdoc: add comment to confusing CSS `main { min-width: 0 }`) - rust-lang#105074 (Add Nicholas Bishop to `.mailmap`) - rust-lang#105081 (Add a regression test for rust-lang#104322) - rust-lang#105086 (rustdoc: clean up sidebar link CSS) - rust-lang#105091 (add Tshepang Mbambo to .mailmap) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
6 participants
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.
No description provided.