fix Auto-merge: Branch 23.08 merge 23.06

rapidsai / cuxfilter

GPU accelerated cross filtering with cuDF.

https://docs.rapids.ai/api/cuxfilter/stable/

Apache License 2.0

273 stars 67 forks source link

Closed AjayThorve closed 1 year ago

AjayThorve commented 1 year ago

Manually resolve conflicts in the auto-merge PR #481

ajschmidt8 commented 1 year ago

@AjayThorve, it looks like a merge conflict turned up.

Can you rebase to pull in the latest changes?

AjayThorve commented 1 year ago

@AjayThorve, it looks like a merge conflict turned up.

Can you rebase to pull in the latest changes?

done

ajschmidt8 commented 1 year ago

@AjayThorve, I don't think that worked as intended.

This PR should have one more commit than the number of commits in the conflicted PR (#481).

Since that PR has 3 commits, this PR should have those commits plus one more commit for the merge conflicts (so 4 total commits).