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-22.02 to branch-22.04 [skip ci] [bot] #4756

Merged
merged 2 commits into from
Feb 11, 2022

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Feb 11, 2022

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

* fix broken links in branch2202

Signed-off-by: liyuan <yuali@nvidia.com>

* update a link which split across lines

Signed-off-by: liyuan <yuali@nvidia.com>
@nvauto
Copy link
Collaborator Author

nvauto commented Feb 11, 2022

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

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

Signed-off-by: Hao Zhu <hazhu@nvidia.com>
@jlowe
Copy link
Member

jlowe commented Feb 11, 2022

Fixing this.

@jlowe jlowe merged commit e8f44f1 into branch-22.04 Feb 11, 2022
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.

4 participants