search

NVIDIA / spark-rapids

Spark RAPIDS plugin - accelerate Apache Spark with GPUs
https://nvidia.github.io/spark-rapids
Apache License 2.0
822 stars 235 forks source link

[auto-merge] branch-24.10 to branch-24.12 [skip ci] [bot] #11679

Closed nvauto closed 3 weeks ago

nvauto commented 3 weeks ago

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

nvauto commented 3 weeks ago

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

{'message': 'Pull Request is not mergeable', '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 remote
git fetch upstream branch-24.10 branch-24.12
git checkout -b fix-auto-merge-conflict-11679 upstream/branch-24.12
git merge upstream/branch-24.10
# Fix any merge conflicts caused by this merge
git commit -am "Merge branch-24.10 into branch-24.12"
git push <personal fork> fix-auto-merge-conflict-11679
# Open a PR targets NVIDIA/spark-rapids 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

pxLi commented 3 weeks ago

I will take care of this conflict later