This is an automatic backport of pull request #454 done by Mergify.
Cherry-pick of 8dc41d6451326d8121e2cacb68595c772186c814 has failed:
On branch mergify/bp/v15.x/pr-454
Your branch is up to date with 'origin/v15.x'.
You are currently cherry-picking commit 8dc41d645.
(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: CHANGELOG.md
modified: baseapp/abci.go
modified: baseapp/baseapp.go
modified: baseapp/options.go
modified: server/config/config.go
modified: server/config/toml.go
modified: server/start.go
modified: simapp/simd/cmd/root.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: baseapp/baseapp_test.go
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
This is an automatic backport of pull request #454 done by Mergify. Cherry-pick of 8dc41d6451326d8121e2cacb68595c772186c814 has failed:
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