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.50-rc.1 (backport #4763) #4766

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 26, 2023

This is an automatic backport of pull request #4763 done by Mergify.
Cherry-pick of 25d7ea6 has failed:

On branch mergify/bp/capability/release/v1.0.x/pr-4763
Your branch is up to date with 'origin/capability/release/v1.0.x'.

You are currently cherry-picking commit 25d7ea6a.
  (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:   modules/capability/go.mod
	modified:   modules/capability/go.sum

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

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 25d7ea6)

# Conflicts:
#	e2e/go.mod
#	e2e/go.sum
#	go.mod
#	go.sum
#	modules/apps/callbacks/go.mod
#	modules/apps/callbacks/go.sum
#	modules/apps/callbacks/testing/simapp/simd/cmd/root.go
#	testing/simapp/simd/cmd/root.go
@damiannolan damiannolan enabled auto-merge (squash) September 26, 2023 13:17
@damiannolan damiannolan merged commit c665e41 into capability/release/v1.0.x Sep 26, 2023
34 of 37 checks passed
@damiannolan damiannolan deleted the mergify/bp/capability/release/v1.0.x/pr-4763 branch September 26, 2023 13:21
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