tuhaihe commented on PR #1547: URL: https://github.com/apache/cloudberry/pull/1547#issuecomment-3810632117
> Now, we cannot `Rebase and merge` this PR due to `This branch cannot be rebased due to conflicts`. --- We still need a few more minutes to explore how to resolve it. > > Let me do some study. If anyone can help resolve this, welcome to leave your thoughts. GitHub cannot replay the commits in this PR due to some contexts changed - I guess. Some commits in this PR already existed in the REL_2_STABLE, so we can try to delete them from this PR, including: - 89b88efe2c8e348205263ad576fe7313892e03c8 - f73537caffe31349414c061e80a221e602bd3aac - 47475f0c38e569ef235c4a45649ca6e83c0ccf91 - 1e03fab56223a9f9bd4fb6ab4c0c47d4c8be9888 So that we can create a safe context for GitHub to make the `Rebase and merge` button green. --- I hope so. @hw118118 PTAL. Thanks! Love to have more thoughts from other reviewers. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
