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

[auto-merge] bot-auto-merge-branch-25.02 to branch-25.04 [skip ci] [bot] #2882

Merged
merged 3 commits into from
Feb 6, 2025

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Feb 5, 2025

auto-merge triggered by github actions on bot-auto-merge-branch-25.02 to create a PR keeping branch-25.04 up-to-date. If this PR is unable to be merged due to conflicts, it will remain open until manually fix.

…p ci] [bot] (#2881)

submodule-sync to create a PR keeping thirdparty/cudf up-to-date.
HEAD commit SHA: f76a6f4, cudf commit
SHA:
rapidsai/cudf@0136e24

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

Signed-off-by: spark-rapids automation <[email protected]>
@nvauto
Copy link
Collaborator Author

nvauto commented Feb 5, 2025

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

{'message': 'Base branch was modified. Review and try the merge again.', 'documentation_url': 'https://docs.github.com/rest/pulls/pulls#merge-a-pull-request', 'status': '405'}

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

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

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

…p ci] [bot] (#2884)

submodule-sync to create a PR keeping thirdparty/cudf up-to-date.
HEAD commit SHA: 8e05f08, cudf commit
SHA:
rapidsai/cudf@0136e24

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

Signed-off-by: spark-rapids automation <[email protected]>
Signed-off-by: spark-rapids automation <[email protected]>
@nvauto nvauto force-pushed the bot-auto-merge-branch-25.02 branch from 9d75300 to 5e12d69 Compare February 6, 2025 00:23
@nvauto nvauto merged commit 287250b into branch-25.04 Feb 6, 2025
3 checks passed
@nvauto
Copy link
Collaborator Author

nvauto commented Feb 6, 2025

SUCCESS - auto-merge

@nvauto nvauto deleted the bot-auto-merge-branch-25.02 branch February 6, 2025 00:23
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