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-24.10 to branch-24.12 [skip ci] [bot] #11568

Merged
merged 2 commits into from
Oct 9, 2024

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Oct 8, 2024

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.

…lanca timezone and LEGACY mode (#11567)

Signed-off-by: Chong Gao <[email protected]>
@nvauto
Copy link
Collaborator Author

nvauto commented Oct 8, 2024

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-11568 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-11568
# 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

@NvTimLiu
Copy link
Collaborator

NvTimLiu commented Oct 9, 2024

Ok I'll manually fix the conflicts

@jlowe
Copy link
Member

jlowe commented Oct 9, 2024

Should be fixed by #11579

@jlowe jlowe merged commit 58eb33f into branch-24.12 Oct 9, 2024
1 check passed
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.

5 participants