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

Merged
merged 5 commits into from
Dec 29, 2023

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Dec 29, 2023

auto-merge triggered by github actions on branch-23.12 to create a PR keeping branch-24.02 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 Dec 29, 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.12 branch-24.02
git checkout -b fix-auto-merge-conflict-10120 upstream/branch-24.02
git merge upstream/branch-23.12
# Fix any merge conflicts caused by this merge
git commit -am "Merge branch-23.12 into branch-24.02"
git push <personal fork> fix-auto-merge-conflict-10120
# Open a PR targets NVIDIA/spark-rapids branch-24.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

nvliyuan and others added 4 commits December 29, 2023 16:51
1, Init changelog with

```
GITHUB_TOKEN=<> scripts/generate-changelog --releases=23.10,23.12
```

2, move 23.08 content to archives folder

Signed-off-by: Tim Liu <[email protected]>
1, Init changelog with

```
GITHUB_TOKEN=<> scripts/generate-changelog --releases=23.10,23.12
```

Signed-off-by: Tim Liu <[email protected]>
@jlowe
Copy link
Member

jlowe commented Dec 29, 2023

working on this

@jlowe jlowe merged commit 6e942f1 into branch-24.02 Dec 29, 2023
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