Skip to content

Extract CrateSidebar component #3215

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

Merged
merged 1 commit into from
Feb 1, 2021
Merged

Conversation

Turbo87
Copy link
Member

@Turbo87 Turbo87 commented Jan 30, 2021

This will make it easier to potentially reuse it on other pages, like the version list page, and it also will make it easier to test this component in isolation :)

r? @pichfl

@locks
Copy link
Contributor

locks commented Feb 1, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Feb 1, 2021

📌 Commit 6b8e09b has been approved by locks

@bors
Copy link
Contributor

bors commented Feb 1, 2021

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

@bors
Copy link
Contributor

bors commented Feb 1, 2021

🔒 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 crate-sidebar (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 crate-sidebar --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 app/templates/crate/version.hbs
CONFLICT (content): Merge conflict in app/templates/crate/version.hbs
Auto-merging app/styles/crate/version.module.css
Auto-merging app/controllers/crate/version.js
Automatic merge failed; fix conflicts and then commit the result.

@Turbo87
Copy link
Member Author

Turbo87 commented Feb 1, 2021

@bors r=locks

@bors
Copy link
Contributor

bors commented Feb 1, 2021

📌 Commit 48f7a8e has been approved by locks

@bors
Copy link
Contributor

bors commented Feb 1, 2021

⌛ Testing commit 48f7a8e with merge 4abaa30...

bors added a commit that referenced this pull request Feb 1, 2021
Extract `CrateSidebar` component

This will make it easier to potentially reuse it on other pages, like the version list page, and it also will make it easier to test this component in isolation :)

r? `@pichfl`
@bors
Copy link
Contributor

bors commented Feb 1, 2021

💥 Test timed out

@Turbo87
Copy link
Member Author

Turbo87 commented Feb 1, 2021

@bors r=locks

@bors
Copy link
Contributor

bors commented Feb 1, 2021

📌 Commit 495c119 has been approved by locks

@bors
Copy link
Contributor

bors commented Feb 1, 2021

⌛ Testing commit 495c119 with merge 4bb81ff...

@bors
Copy link
Contributor

bors commented Feb 1, 2021

☀️ Test successful - checks-actions
Approved by: locks
Pushing 4bb81ff to master...

@bors bors merged commit 4bb81ff into rust-lang:master Feb 1, 2021
@Turbo87 Turbo87 deleted the crate-sidebar branch February 3, 2021 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants