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

deps(identity): update ed25519-dalek to 2.0 (backport #4337) #4343

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 18, 2023

This is an automatic backport of pull request #4337 done by Mergify.
Cherry-pick of fb61697 has failed:

On branch mergify/bp/v0.51/pr-4337
Your branch is up to date with 'origin/v0.51'.

You are currently cherry-picking commit fb616973.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   identity/src/ed25519.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   Cargo.toml
	both modified:   identity/CHANGELOG.md
	both modified:   identity/Cargo.toml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Pull-Request: #4337.
(cherry picked from commit fb61697)

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	identity/CHANGELOG.md
#	identity/Cargo.toml
@mergify mergify bot added the conflicts label Aug 18, 2023
@thomaseizinger
Copy link
Contributor

cc @altonen

@altonen
Copy link

altonen commented Aug 18, 2023

The conflicts are resolved but one DQ came up: since I don't have permissions to push into this repo, do I just create a PR that merges the fixes into mergify/bp/v0.51/pr-4337?

@thomaseizinger
Copy link
Contributor

do I just create a PR that merges the fixes into mergify/bp/v0.51/pr-4337?

Either this or open your own PR and we close this one instead :)
If you open your own, make sure to target the correct branch!

@mergify
Copy link
Contributor Author

mergify bot commented Aug 23, 2023

This pull request has merge conflicts. Could you please resolve them @mergify[bot]? 🙏

@mxinden mxinden closed this Aug 23, 2023
@mergify mergify bot deleted the mergify/bp/v0.51/pr-4337 branch August 23, 2023 19:13
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.

4 participants