search

NVIDIA / spark-rapids-examples

A repo for all spark examples using Rapids Accelerator including ETL, ML/DL, etc.
Apache License 2.0
125 stars 51 forks source link

[auto-merge] branch-24.08 to branch-24.10 [skip ci] [bot] #429

Closed nvauto closed 2 months ago

nvauto commented 2 months ago

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

nvauto commented 2 months 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-examples remote
git fetch upstream branch-24.08 branch-24.10
git checkout -b fix-auto-merge-conflict-429 upstream/branch-24.10
git merge upstream/branch-24.08
# Fix any merge conflicts caused by this merge
git commit -am "Merge branch-24.08 into branch-24.10"
git push <personal fork> fix-auto-merge-conflict-429
# Open a PR targets NVIDIA/spark-rapids-examples branch-24.10

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