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-23.08 to branch-23.10 [skip ci] [bot] #9383

Closed
wants to merge 1 commit into from

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Oct 5, 2023

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

@nvauto
Copy link
Collaborator Author

nvauto commented Oct 5, 2023

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'}

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

# Assume upstream is NVIDIA/spark-rapids remote
git fetch upstream branch-23.08 branch-23.10
git checkout -b fix-auto-merge-conflict-9383 upstream/branch-23.10
git merge upstream/branch-23.08
# Fix any merge conflicts caused by this merge
git commit -am "Merge branch-23.08 into branch-23.10"
git push <personal fork> fix-auto-merge-conflict-9383
# Open a PR targets NVIDIA/spark-rapids branch-23.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

@pxLi
Copy link
Collaborator

pxLi commented Oct 5, 2023

I will take care of this one later

@pxLi
Copy link
Collaborator

pxLi commented Oct 5, 2023

the commit history has diverged too much since the 23.08 release (too much deleted files and new added files)
lets cherry pick needed updates manually

@pxLi pxLi closed this Oct 5, 2023
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