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.12 to branch-25.02 [skip ci] [bot] #11948

Merged
merged 3 commits into from
Jan 10, 2025

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Jan 10, 2025

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

Wait for the pre-merge CI job to SUCCEED

---------

Signed-off-by: nvauto <[email protected]>
Signed-off-by: Tim Liu <[email protected]>
Co-authored-by: Tim Liu <[email protected]>
@nvauto
Copy link
Collaborator Author

nvauto commented Jan 10, 2025

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.12 branch-25.02
git checkout -b fix-auto-merge-conflict-11948 upstream/branch-25.02
git merge upstream/branch-24.12
# Fix any merge conflicts caused by this merge
git commit -am "Merge branch-24.12 into branch-25.02"
git push <personal fork> fix-auto-merge-conflict-11948
# Open a PR targets NVIDIA/spark-rapids branch-25.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

@nvauto nvauto requested a review from a team as a code owner January 10, 2025 09:24
@pxLi
Copy link
Collaborator

pxLi commented Jan 10, 2025

I will take care of this after all 24.12.1 hotfix PRs get merged

nvauto and others added 2 commits January 10, 2025 17:52
Wait for the pre-merge CI job to SUCCEED

---------

Signed-off-by: nvauto <[email protected]>
Signed-off-by: Tim Liu <[email protected]>
Co-authored-by: Tim Liu <[email protected]>
Update change log with CLI: 

   scripts/generate-changelog --token=<GIT_TOKEN> --releases=24.10,24.12

Signed-off-by: nvauto <[email protected]>
pxLi added a commit that referenced this pull request Jan 10, 2025
resolve merge conflict at #11948

this must be merged as `create a merge commit`
@pxLi pxLi merged commit c787510 into branch-25.02 Jan 10, 2025
1 of 2 checks 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.

2 participants