Conversation
…#2214) #2212 was into `main` after `main` had already been updated to RAPIDS 26.04. This change is intended for RAPIDS 26.02, so this PR backports it to the `release/26.02` branch. ## Notes for Reviewers ### How this should be merged I think normal squash and merge should be fine? The commit SHA is different because of the direction of the `cherry-pick` anyway. ### How I made this branch ```shell git checkout main git pull upstream main git fetch upstream release/26.02 git checkout release/26.02 git checkout -b pip-changes git cherry-pick f380eff ``` Co-authored-by: Mike McCarty <mmccarty@nvidia.com>
|
FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the |
|
An identical change is already on I think that's the cause of the conflict here. Will fix it momentarily. |
|
ugh sorry @bdice @AyodeAwe @rockhowse I really made a mess of this. I'd meant to no-squash merge the manual merge-conflict resolution PR (#2216) but merged this one accidentally. Too-similar PR titles + trying to go too fast. Forward-mergers should now be working again here and both 
https://github.com/rapidsai/rmm/commits/main/ I don't think we need to do anything about this immediately, please let me know if you disagree and see any issues. Sorry again 😫 |
1 participant
Forward-merge triggered by push to release/26.02 that creates a PR to keep main 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.