mergify[bot]
commented
4 months ago Cherry-pick of 11b6186e0b308c48b624b376ec20e2ecfd01fa4a has failed:
On branch mergify/bp/osmo-v23/v0.47.5/pr-552
Your branch is up to date with 'origin/osmo-v23/v0.47.5'.
You are currently cherry-picking commit 11b6186e0.
(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: server/config/config.go
modified: server/config/toml.go
modified: server/mock/store.go
modified: server/start.go
modified: server/util.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: baseapp/options.go
both modified: store/rootmulti/store.go
both modified: store/types/store.go
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
This is an automatic backport of pull request #552 done by Mergify. Cherry-pick of 11b6186e0b308c48b624b376ec20e2ecfd01fa4a has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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