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.

Sign up for GitHub

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

Jump to bottom

[gpuCI] Forward-merge branch-21.06 to branch-21.08 [skip ci] #643

Merged
merged 1 commit into from
Jun 7, 2021
Merged

[gpuCI] Forward-merge branch-21.06 to branch-21.08 [skip ci] #643

merged 1 commit into from
Jun 7, 2021

Conversation

GPUtester
Copy link
Contributor

Forward-merge triggered by push to branch-21.06 that creates a PR to keep branch-21.08 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge.

@GPUtester GPUtester requested a review from a team as a code owner June 7, 2021 15:33
@GPUtester
Copy link
Contributor Author

FAILURE - Unable to forward-merge due to conflicts, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/gpuci/#forward-mergers
IMPORTANT: Before merging and approving this PR, be sure to change the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

@github-actions github-actions bot added the gpuCI gpuCI issue label Jun 7, 2021
@pentschev
Copy link
Member

@ajschmidt8 how do we deal with this? branch-21.08 is already up-to-date, so ideally we don't want this forward-merge to happen. Should just closing this PR suffice?

@ajschmidt8
Copy link
Member

@ajschmidt8 how do we deal with this? branch-21.08 is already up-to-date, so ideally we don't want this forward-merge to happen. Should just closing this PR suffice?

Ah. This stinks. Unfortunately we do have to merge this so that branch-21.08 has the 0d6c3b7 commit hash in it's history. If we close it, it will only get re-opened the next time a PR is merged to 21.06.

I'll open a PR to merge 0d6c3b7 and then revert it in a subsequent comimt.

@ajschmidt8 ajschmidt8 mentioned this pull request Jun 7, 2021
Merged
@ajschmidt8 ajschmidt8 merged commit 1a10ca8 into branch-21.08 Jun 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
gpuCI gpuCI issue
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@GPUtester @pentschev @ajschmidt8