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.06 to branch-24.08 [skip ci] [bot] #689

Merged
merged 1 commit into from
Jul 23, 2024

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Jul 12, 2024

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

* update docker files

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

* update docker.python file too

---------

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

nvauto commented Jul 12, 2024

FAILURE - Unable to auto-merge. Manual operation is required.

{'message': 'Base branch was modified. Review and try the merge again.', '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-ml remote
git fetch upstream branch-24.06 branch-24.08
git checkout -b fix-auto-merge-conflict-689 upstream/branch-24.08
git merge upstream/branch-24.06
# Fix any merge conflicts caused by this merge
git commit -am "Merge branch-24.06 into branch-24.08"
git push <personal fork> fix-auto-merge-conflict-689
# Open a PR targets NVIDIA/spark-rapids-ml branch-24.08

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

@eordentlich
Copy link
Collaborator

build

eordentlich
eordentlich previously approved these changes Jul 17, 2024
@eordentlich eordentlich dismissed their stale review July 17, 2024 20:28

need to follow steps to manually merge

@eordentlich eordentlich merged commit dd108d3 into branch-24.08 Jul 23, 2024
11 of 12 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.

3 participants