Skip to content

Update Rust crate conduit-static to 0.9.0-alpha.4 #4038

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
Oct 19, 2021

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Oct 19, 2021

WhiteSource Renovate

This PR contains the following updates:

Package Type Update Change
conduit-static dependencies patch 0.9.0-alpha.3 -> 0.9.0-alpha.4

Configuration

📅 Schedule: At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, click this checkbox.

This PR has been generated by WhiteSource Renovate. View repository job log here.

@Turbo87
Copy link
Member

Turbo87 commented Oct 19, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Oct 19, 2021

📌 Commit ea31f0b has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Oct 19, 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 renovate/conduit-static-0.x (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 renovate/conduit-static-0.x --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 Cargo.toml
CONFLICT (content): Merge conflict in Cargo.toml
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Oct 19, 2021

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

@renovate renovate bot force-pushed the renovate/conduit-static-0.x branch from ea31f0b to b5346ac Compare October 19, 2021 11:33
@Turbo87
Copy link
Member

Turbo87 commented Oct 19, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Oct 19, 2021

📌 Commit b5346ac has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Oct 19, 2021

⌛ Testing commit b5346ac with merge 8d0ce48...

@bors
Copy link
Contributor

bors commented Oct 19, 2021

☀️ Test successful - checks-actions
Approved by: Turbo87
Pushing 8d0ce48 to master...

@bors bors merged commit 8d0ce48 into master Oct 19, 2021
@renovate renovate bot deleted the renovate/conduit-static-0.x branch October 19, 2021 11:47
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.

3 participants