Closed mergify[bot] closed 22 hours ago
Cherry-pick of 9aeb07ce0da7b1d91101197b001845819f6fe280 has failed:
On branch mergify/bp/branch-3.1/pr-53052
Your branch is up to date with 'origin/branch-3.1'.
You are currently cherry-picking commit 9aeb07ce0d.
(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: be/src/column/column_helper.h
modified: be/src/exec/stream/aggregate/stream_aggregator.cpp
modified: be/src/exprs/agg/group_concat.h
modified: be/src/exprs/array_functions.tpp
modified: be/src/exprs/utility_functions.cpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: be/src/storage/column_in_predicate.cpp
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[bot]: Backport conflict, please reslove the conflict and resubmit the pr
Why I'm doing:
What I'm doing:
same with #52885
What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist:
Bugfix cherry-pick branch check:
This is an automatic backport of pull request #53052 done by Mergify.
Why I'm doing:
What I'm doing:
same with #52885
What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist: