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 Stderr::as_file_handle error message #1510

Merged
merged 1 commit into from
Aug 13, 2020
Merged

Conversation

RalfJung
Copy link
Member

No description provided.

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Aug 13, 2020

📌 Commit 835db6c has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Aug 13, 2020

🔒 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 stderr (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 stderr --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
Auto-merging src/shims/posix/fs.rs
CONFLICT (content): Merge conflict in src/shims/posix/fs.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Aug 13, 2020

☔ The latest upstream changes (presumably #1509) made this pull request unmergeable. Please resolve the merge conflicts.

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Aug 13, 2020

📌 Commit df31129 has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Aug 13, 2020

⌛ Testing commit df31129 with merge ca9e988...

@bors
Copy link
Contributor

bors commented Aug 13, 2020

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing ca9e988 to master...

@bors bors merged commit ca9e988 into rust-lang:master Aug 13, 2020
@RalfJung RalfJung deleted the stderr branch August 13, 2020 13:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants