search

rapidsai / devcontainers

18 stars 28 forks source link

Forward-merge branch-24.12 into branch-25.02 #423

Closed rapids-bot[bot] closed 3 days ago

rapids-bot[bot] commented 1 week ago

Forward-merge triggered by push to branch-24.12 that creates a PR to keep branch-25.02 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. See forward-merger docs for more info.

rapids-bot[bot] commented 1 week ago

FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/

IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

jameslamb commented 3 days ago

Put up https://github.com/rapidsai/devcontainers/pull/424 to fix the conflicts