Skip to content

[gpuCI] Forward-merge branch-22.02 to branch-22.04 [skip gpuci] - #217

Merged
raydouglass merged 2 commits into
branch-22.04from
branch-22.02
Feb 9, 2022
Merged

raydouglass merged 2 commits into
branch-22.04from
branch-22.02

Conversation

@GPUtester

Copy link
Copy Markdown
Contributor

Forward-merge triggered by push to branch-22.02 that creates a PR to keep branch-22.04 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

Copy link
Copy Markdown
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.

@jakirkham

Copy link
Copy Markdown
Member

Resolving conflicts in PR ( #220 )

@raydouglass
raydouglass merged commit 9fa5a75 into branch-22.04 Feb 9, 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