Skip to content

Extend kvstore example add with with key types (backport #1876)#1965

Merged
melekes merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-1876
Jan 5, 2024
Merged

Extend kvstore example add with with key types (backport #1876)#1965
melekes merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-1876

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 5, 2024

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

On branch mergify/bp/v1.x/pr-1876
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit 5633886a7.
  (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:   abci/example/kvstore/README.md
	modified:   abci/example/kvstore/helpers.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   abci/example/kvstore/kvstore.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 5633886)

# Conflicts:
#	abci/example/kvstore/kvstore.go
@mergify mergify bot requested a review from a team as a code owner January 5, 2024 06:44
@mergify mergify bot requested a review from a team January 5, 2024 06:44
@mergify mergify bot added the conflicts label Jan 5, 2024
@melekes melekes merged commit c10dace into v1.x Jan 5, 2024
@melekes melekes deleted the mergify/bp/v1.x/pr-1876 branch January 5, 2024 06:59
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.

2 participants