osmosis-labs / cosmos-sdk

:chains: A Framework for Building High Value Public Blockchains :sparkles:
https://cosmos.network/
Apache License 2.0
14 stars 34 forks source link

chore: Unfork iavl (backport #377) #378

Closed mergify[bot] closed 1 year ago

mergify[bot] commented 1 year ago

This is an automatic backport of pull request #377 done by Mergify. Cherry-pick of 65778323dbb502a9d399c9636fbae52f6a3ecaf1 has failed:

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

You are currently cherry-picking commit 65778323d.
  (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:   store/cache/cache_test.go
    modified:   store/iavl/store.go
    modified:   store/iavl/store_test.go
    modified:   store/iavl/tree.go
    modified:   store/iavl/tree_test.go
    modified:   store/prefix/store_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   go.mod
    both modified:   go.sum

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](https://docs.mergify.com/). 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 ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com
p0mvn commented 1 year ago

@catShaark could you please help with resolving issues here?

catShaark commented 1 year ago

yesss, I'll do this