Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[submodule-sync] bot-submodule-sync-branch-24.12 to branch-24.12 [skip ci] [bot] #2612

Merged
merged 3 commits into from
Nov 20, 2024

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Nov 20, 2024

submodule-sync to create a PR keeping thirdparty/cudf up-to-date.
HEAD commit SHA: 85354cc, cudf commit SHA: rapidsai/cudf@3111aa4

This PR will be auto-merged if test passed. If failed, it will remain open until test pass or manually fix.

@nvauto
Copy link
Collaborator Author

nvauto commented Nov 20, 2024

HEAD commit SHA: 85354cc, CUDF commit SHA: rapidsai/cudf@3111aa4
Test passed: True

@nvauto
Copy link
Collaborator Author

nvauto commented Nov 20, 2024

FAILURE - Unable to auto-merge. Manual operation is required.

{'message': 'Server Error'}

Please use the following steps to fix the merge conflicts manually:

# Assume upstream is NVIDIA/spark-rapids-jni remote
git fetch upstream bot-submodule-sync-branch-24.12 branch-24.12
git checkout -b fix-auto-merge-conflict-2612 upstream/branch-24.12
git merge upstream/bot-submodule-sync-branch-24.12
# Fix any merge conflicts caused by this merge
git commit -am "Merge bot-submodule-sync-branch-24.12 into branch-24.12"
git push <personal fork> fix-auto-merge-conflict-2612
# Open a PR targets NVIDIA/spark-rapids-jni branch-24.12

IMPORTANT: Before merging this PR, be sure to change the merging strategy to Create a merge commit (repo admin only).

Once this PR is merged, the auto-merge PR should automatically be closed since it contains the same commit hashes

nvauto added a commit that referenced this pull request Nov 20, 2024
@nvauto
Copy link
Collaborator Author

nvauto commented Nov 20, 2024

HEAD commit SHA: 867d6bd, CUDF commit SHA: rapidsai/cudf@be9ba6c
Test passed: True

@nvauto nvauto merged commit 1f32461 into branch-24.12 Nov 20, 2024
3 checks passed
@nvauto
Copy link
Collaborator Author

nvauto commented Nov 20, 2024

SUCCESS - auto-merge

@nvauto nvauto deleted the bot-submodule-sync-branch-24.12 branch November 20, 2024 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant