[auto-merge] bot-auto-merge-branch-24.12 to branch-25.02 [skip ci] [bot] #2750
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Wait for the pre-merge CI job to SUCCEED --------- Signed-off-by: nvauto <[email protected]> Co-authored-by: YanxuanLiu <[email protected]>
Signed-off-by: spark-rapids automation <[email protected]>
|
FAILURE - Unable to auto-merge. Manual operation is required. Please use the following steps to fix the merge conflicts manually: IMPORTANT: Before merging this PR, be sure to change the merging strategy to Once this PR is merged, the auto-merge PR should automatically be closed since it contains the same commit hashes |
|
I will take care of this |
pxLi
added a commit
that referenced
this pull request
Jan 10, 2025
resolve conflict at #2750 this must be merged as `create a merge commit`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
auto-merge triggered by github actions on
bot-auto-merge-branch-24.12to create a PR keepingbranch-25.02up-to-date. If this PR is unable to be merged due to conflicts, it will remain open until manually fix.