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

Fix auto merge conflict 10393 [skip ci] #10394

Merged
merged 2 commits into from
Feb 8, 2024

Conversation

NvTimLiu
Copy link
Collaborator

@NvTimLiu NvTimLiu commented Feb 8, 2024

Resolve auto-merge conflict at #10393.

Keep 24.04 CONTRIBUTION.md

Will follow up to modify to branch-24.04 in the file docs/dev/testing.md with another PR.

NOTE: this must be merged as create a merge commit

Version to 24.02.0-SNAPSHOT in CONTRIBUTING.md

Branch to branch-24.02 in docs/dev/testing.md

Signed-off-by: Tim Liu <timl@nvidia.com>
@NvTimLiu NvTimLiu added the documentation Improvements or additions to documentation label Feb 8, 2024
@NvTimLiu NvTimLiu self-assigned this Feb 8, 2024
@NvTimLiu NvTimLiu changed the title Fix auto merge conflict 10393 Fix auto merge conflict 10393 [skip ci] Feb 8, 2024
@NvTimLiu
Copy link
Collaborator Author

NvTimLiu commented Feb 8, 2024

build

@jlowe jlowe merged commit bf0a0b0 into NVIDIA:branch-24.04 Feb 8, 2024
41 checks passed
NvTimLiu added a commit to NvTimLiu/spark-rapids that referenced this pull request Feb 15, 2024
Update test doc for 24.04

To follow up NVIDIA#10394

Signed-off-by: Tim Liu <timl@nvidia.com>
jlowe pushed a commit that referenced this pull request Feb 15, 2024
Update test doc for 24.04

To follow up #10394

Signed-off-by: Tim Liu <timl@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants