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 12153 [skip ci] #12155

Merged
merged 3 commits into from
Feb 17, 2025

Conversation

pxLi
Copy link
Member

@pxLi pxLi commented Feb 17, 2025

resolve automerge conflict at #12153

NOTE: this change must be merged as create a merge commit

nvauto and others added 3 commits February 17, 2025 17:21
…VIDIA#12129)

Wait for the pre-merge CI job to SUCCEED

also fix NVIDIA#12152

---------

Signed-off-by: nvauto <[email protected]>
Co-authored-by: YanxuanLiu <[email protected]>
Update change log with CLI: 

   scripts/generate-changelog --token=<GIT_TOKEN> --releases=24.12,25.02

Signed-off-by: nvauto <[email protected]>
@pxLi pxLi self-assigned this Feb 17, 2025
@pxLi pxLi requested a review from a team as a code owner February 17, 2025 09:40
@pxLi pxLi added documentation Improvements or additions to documentation build Related to CI / CD or cleanly building labels Feb 17, 2025
@pxLi
Copy link
Member Author

pxLi commented Feb 17, 2025

build

@NvTimLiu NvTimLiu self-requested a review February 17, 2025 09:42
@pxLi pxLi merged commit 38bbac0 into NVIDIA:branch-25.04 Feb 17, 2025
52 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to CI / CD or cleanly building documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants