Cherry pick #93827 to 25.8: Fix rebuilding of projections with _part_offset during merge#94041
Conversation
Fix rebuilding of projections with _part_offset during merge
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h1m31s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h0m33s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d1h4m22s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h48m13s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h59m47s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h4m7s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h14m49s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h47m4s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h59m22s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h59m47s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h54m34s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h1m1s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h5m10s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h0m19s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
Dear @KochetovNicolai, @amosbird, the PR is not updated for 1d0h0m57s. Please, either resolve the conflicts, or close it to finish the backport process of #93827 |
|
@Felixoid Hi! I think something went wrong with this cherry-pick PR. Could you advise how to properly recreate a PR for the 25.8 backport? |
|
Looks totally fine, you need to merge the conflicts. Both cherrypick/25.8/93827 and backport/25.8/93827 look good 30df436 It's a valid conflict. |
…rypick/25.8/93827
5c99128 to
1c3968a
Compare
Original pull-request #93827
Do not merge this PR manually
This pull-request is a first step of an automated backporting.
It contains changes similar to calling
git cherry-picklocally.If you intend to continue backporting the changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.
The check results does not matter at this step - you can safely ignore them.
Troubleshooting
If the conflicts were resolved in a wrong way
If this cherry-pick PR is completely screwed by a wrong conflicts resolution, and you want to recreate it:
pr-cherrypicklabel from the PRYou also need to check the Original pull-request for
pr-backports-createdlabel, and delete if it's presented thereThe PR source
The PR is created in the CI job