Closed mergify[bot] closed 1 day ago
Cherry-pick of 9bb7530d048b86bd9e2f69fdba05a3818e6d96b8 has failed:
On branch mergify/bp/v4.0.x/pr-12765
Your branch is up to date with 'origin/v4.0.x'.
You are currently cherry-picking commit 9bb7530d04.
(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:
new file: deps/rabbitmq_ct_helpers/src/stream_test_utils.erl
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: deps/rabbitmq_ct_helpers/Makefile
both modified: deps/rabbitmq_stream/test/protocol_interop_SUITE.erl
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 #10275 by @gomoripeti re-submitted so that Actions have access to all the GH secrets.
This is an automatic backport of pull request #12765 done by Mergify.