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: bump SDK v0.47.5 (backport #4539) #4550

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 4, 2023

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

On branch mergify/bp/callbacks/release/v0.1.x+ibc-go-v7.3.x/pr-4539
Your branch is up to date with 'origin/callbacks/release/v0.1.x+ibc-go-v7.3.x'.

You are currently cherry-picking commit 2007367d.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   e2e/go.mod
	deleted by us:   e2e/go.sum
	both modified:   go.mod
	both modified:   go.sum
	both modified:   modules/apps/callbacks/go.mod
	both modified:   modules/apps/callbacks/go.sum

no changes added to commit (use "git add" and/or "git commit -a")

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

(cherry picked from commit 2007367)

# Conflicts:
#	e2e/go.mod
#	e2e/go.sum
#	go.mod
#	go.sum
#	modules/apps/callbacks/go.mod
#	modules/apps/callbacks/go.sum
@srdtrk srdtrk assigned crodriguezvega and unassigned srdtrk Sep 7, 2023
…/callbacks/release/v0.1.x+ibc-go-v7.3.x/pr-4539
@srdtrk srdtrk merged commit 6cb509e into callbacks/release/v0.1.x+ibc-go-v7.3.x Sep 8, 2023
@srdtrk srdtrk deleted the mergify/bp/callbacks/release/v0.1.x+ibc-go-v7.3.x/pr-4539 branch September 8, 2023 06:44
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