Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 19, 2025


This is an automatic backport of pull request #14403 done by [Mergify](https://mergify.com).

acogoluegnes and others added 7 commits August 19, 2025 18:57
(cherry picked from commit 02449bd)

# Conflicts:
#	deps/rabbitmq_stream/src/rabbit_stream_reader.erl
(cherry picked from commit ba8745a)

# Conflicts:
#	deps/rabbitmq_stream/src/rabbit_stream_reader.erl
(cherry picked from commit 987f551)
(cherry picked from commit 147dfb0)
(cherry picked from commit 55d6419)
(cherry picked from commit e763467)
(cherry picked from commit 173876c)
Copy link
Author

mergify bot commented Aug 19, 2025

Cherry-pick of 02449bd has failed:

On branch mergify/bp/v4.1.x/pr-14403
Your branch is up to date with 'origin/v4.1.x'.

You are currently cherry-picking commit 02449bd5d.
  (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:   deps/rabbitmq_stream/src/rabbit_stream_reader.hrl
	modified:   deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_stream/src/rabbit_stream_reader.erl

Cherry-pick of ba8745a has failed:

On branch mergify/bp/v4.1.x/pr-14403
Your branch is ahead of 'origin/v4.1.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ba8745ab4.
  (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:   deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_stream/src/rabbit_stream_reader.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

michaelklishin added a commit that referenced this pull request Aug 19, 2025
@michaelklishin
Copy link
Collaborator

@Mergifyio rebase

Copy link
Author

mergify bot commented Aug 19, 2025

rebase

☑️ Nothing to do, the required conditions are not met

  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • queue-position = -1 [📌 rebase requirement]
  • any of:
    • #commits > 1 [📌 rebase requirement]
    • #commits-behind > 0 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

@michaelklishin michaelklishin merged commit bc281d5 into v4.1.x Aug 19, 2025
274 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.1.x/pr-14403 branch August 19, 2025 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants