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] bot-auto-merge-branch-24.04 to branch-24.06 [skip ci] [bot] #1935

Merged
merged 4 commits into from
Apr 10, 2024

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Apr 8, 2024

auto-merge triggered by github actions on bot-auto-merge-branch-24.04 to create a PR keeping branch-24.06 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 Apr 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'}

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

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

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

* Update blossom-ci.yml

* Update blossom-ci.yml

Signed-off-by: YanxuanLiu <[email protected]>

---------

Signed-off-by: YanxuanLiu <[email protected]>
@nvauto nvauto force-pushed the bot-auto-merge-branch-24.04 branch from ca18fbc to aedd32f Compare April 9, 2024 03:10
@nvauto
Copy link
Collaborator Author

nvauto commented Apr 9, 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'}

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

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

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 and others added 2 commits April 10, 2024 07:16
@nvauto nvauto force-pushed the bot-auto-merge-branch-24.04 branch from aedd32f to 96e31ec Compare April 9, 2024 23:16
@nvauto
Copy link
Collaborator Author

nvauto commented Apr 9, 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'}

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

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

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 merged commit d11b657 into branch-24.06 Apr 10, 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.

3 participants