Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 10, 2024

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

On branch mergify/bp/release/v0.50.x/pr-18956
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit dee9eda5e.
  (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:   api/cosmos/bank/v1beta1/query.pulsar.go
	modified:   api/cosmos/bank/v1beta1/query_grpc.pb.go
	modified:   proto/cosmos/bank/v1beta1/query.proto
	modified:   x/bank/keeper/grpc_query_test.go
	modified:   x/bank/types/query.pb.gw.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   client/docs/swagger-ui/swagger.yaml
	deleted by us:   proto/cosmos/protocolpool/v1/tx.proto
	deleted by us:   x/bank/CHANGELOG.md
	both modified:   x/bank/keeper/grpc_query.go
	both modified:   x/bank/types/query.pb.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

…18956)

Co-authored-by: Sai Kumar <[email protected]>
(cherry picked from commit dee9eda)

# Conflicts:
#	CHANGELOG.md
#	client/docs/swagger-ui/swagger.yaml
#	proto/cosmos/protocolpool/v1/tx.proto
#	x/bank/CHANGELOG.md
#	x/bank/keeper/grpc_query.go
#	x/bank/types/query.pb.go
@mergify mergify bot requested a review from a team January 10, 2024 14:55
@mergify mergify bot added the conflicts label Jan 10, 2024
@julienrbrt julienrbrt self-assigned this Jan 10, 2024
@julienrbrt julienrbrt removed their assignment Jan 10, 2024
@julienrbrt julienrbrt mentioned this pull request Jan 10, 2024
12 tasks
@julienrbrt julienrbrt merged commit 2a199f5 into release/v0.50.x Jan 10, 2024
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-18956 branch January 10, 2024 16:56
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
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