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

Update pulldown-cmark version #62789

Merged
merged 1 commit into from
Jul 20, 2019

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jul 18, 2019

Fixes #62571.
Fixes #62770.
Fixes #62552.

cc @rust-lang/rustdoc @Centril @pietroalbini

@ehuss
Copy link
Contributor

ehuss commented Jul 18, 2019

This also closes #62770 and #62552.

@GuillaumeGomez
Copy link
Member Author

@ehuss Thanks for the info!

r? @Manishearth

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 19, 2019

📌 Commit f23373353e14e589278be0a0c49f2f866783e4e7 has been approved by Manishearth

@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 19, 2019
@GuillaumeGomez
Copy link
Member Author

Considering it makes changes in the lock file, I'll give it a small priority to avoid having to update it too much.

@bors: p=1

@bors
Copy link
Contributor

bors commented Jul 19, 2019

🔒 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 update-pulldown-cmark (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 update-pulldown-cmark --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: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in 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 19, 2019
@GuillaumeGomez
Copy link
Member Author

@bors: r=Manishearth

@bors
Copy link
Contributor

bors commented Jul 20, 2019

📌 Commit 9d6b29a has been approved by Manishearth

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 20, 2019
@bors
Copy link
Contributor

bors commented Jul 20, 2019

⌛ Testing commit 9d6b29a with merge 95b1fe5...

bors added a commit that referenced this pull request Jul 20, 2019
@bors
Copy link
Contributor

bors commented Jul 20, 2019

☀️ Test successful - checks-azure
Approved by: Manishearth
Pushing 95b1fe5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 20, 2019
@bors bors merged commit 9d6b29a into rust-lang:master Jul 20, 2019
@GuillaumeGomez GuillaumeGomez deleted the update-pulldown-cmark branch July 20, 2019 22:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
5 participants