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

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

Merged
merged 2 commits into from
Nov 21, 2024

Conversation

jakirkham
Copy link
Member

Resolving conflicts in forward merge PR: #1409

wence- and others added 2 commits November 20, 2024 19:49
Handling the str vs. bytes discrepancy should have been covered by the changes in rapidsai#1118.

Authors:
  - Lawrence Mitchell (https://github.com/wence-)
  - Peter Andreas Entschev (https://github.com/pentschev)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)
  - https://github.com/jakirkham

URL: rapidsai#1130
@jakirkham jakirkham requested a review from a team as a code owner November 21, 2024 01:53
@jakirkham jakirkham requested a review from bdice November 21, 2024 01:53
@github-actions github-actions bot added the conda conda issue label Nov 21, 2024
@raydouglass raydouglass merged commit 9d2e2d6 into rapidsai:branch-25.02 Nov 21, 2024
26 of 27 checks passed
@jakirkham jakirkham deleted the branch-25.02-merge-24.12 branch November 21, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conda conda issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants