Skip to content

Comments

Merge release/26.02 into main#851

Merged
jameslamb merged 7 commits intorapidsai:mainfrom
jameslamb:main-merge-release/26.02
Feb 11, 2026
Merged

Merge release/26.02 into main#851
jameslamb merged 7 commits intorapidsai:mainfrom
jameslamb:main-merge-release/26.02

Conversation

@jameslamb
Copy link
Member

Fixes forward-merger conflicts seen in #845

Replaces #849

Notes for Reviewers

How I made this branch:

git checkout main
git pull upstream main
git fetch upstream release/26.02
git checkout release/26.02

# drop the release commit w/ the `v26.02.00` tag
git reset --hard HEAD~1

# create the branch fixing forward-merge conflicts
git checkout main
git checkout -b main-merge-release/26.02
git merge --no-squash release/26.02

@jameslamb jameslamb requested a review from AyodeAwe February 11, 2026 16:48
@jameslamb jameslamb requested a review from a team as a code owner February 11, 2026 16:48
@jameslamb jameslamb changed the title Main merge release/26.02 Merge release/26.02 into main Feb 11, 2026
@jameslamb
Copy link
Member Author

/merge nosquash

@rapids-bot
Copy link
Contributor

rapids-bot bot commented Feb 11, 2026

Commit history integrity check failed: not all commits from original PR #845 appear to be present individually in this PR's history. This usually happens if commits were squashed during the manual resolution process. Please ensure all original commits are preserved individually. You can fix this and try the /merge nosquash command again.

@jameslamb
Copy link
Member Author

Commit history integrity check failed: not all commits from original PR #845 appear to be present individually in this PR's history.

Commenting for those finding this from search. It's intentional that this PR does not have every commit from #845. We don't want the commit with the v26.02.00 tag on it (d79edff) to get to main.

Manually no-squash merging this.

@jameslamb jameslamb merged commit 5f0ef7d into rapidsai:main Feb 11, 2026
98 of 99 checks passed
@jameslamb jameslamb deleted the main-merge-release/26.02 branch February 11, 2026 18:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants