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] branch-21.12 to branch-22.02 [skip ci] [bot] #4267

Merged
merged 1 commit into from
Dec 2, 2021

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Dec 2, 2021

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

…reuse [databricks] (#4257)

* Implement getShuffleRDD and fixup mismatched output types on shuffle reuse

Signed-off-by: Jason Lowe <jlowe@nvidia.com>

* Fix Databricks 9.1 build
@nvauto
Copy link
Collaborator Author

nvauto commented Dec 2, 2021

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

{'message': 'Pull Request is not mergeable', 'documentation_url': 'https://docs.github.com/rest/reference/pulls#merge-a-pull-request'}

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

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

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

@jlowe
Copy link
Member

jlowe commented Dec 2, 2021

Working on this

@jlowe jlowe self-assigned this Dec 2, 2021
@jlowe jlowe merged commit 62c075a into branch-22.02 Dec 2, 2021
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.

2 participants