Closed mergify[bot] closed 4 months ago
Cherry-pick of ed74ee8a8a05329c5125edd2aba5c84e255432ff has failed:
On branch mergify/bp/release/v0.49.x/pr-1378
Your branch is up to date with 'origin/release/v0.49.x'.
You are currently cherry-picking commit ed74ee8a8.
(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: x/fbridge/module/module.go
modified: x/fbridge/types/codec.go
modified: x/fbridge/types/keys.go
modified: x/fbridge/types/msgs.go
new file: x/fbridge/types/msgs_test.go
modified: x/fswap/types/keys.go
modified: x/fswap/types/msgs.go
new file: x/fswap/types/msgs_test.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: client/docs/swagger-ui/swagger.yaml
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
Attention: Patch coverage is 96.61017%
with 2 lines
in your changes are missing coverage. Please review.
Project coverage is 68.93%. Comparing base (
1da1023
) to head (033051d
).
Description
Motivation and context
How has this been tested?
Screenshots (if appropriate):
Checklist:
CHANGELOG.md
client/docs/swagger-ui/swagger.yaml
This is an automatic backport of pull request #1378 done by Mergify.