Fix auto merge conflict 10704 [skip ci]

[NvTimLiu]

Resolve auto-merge conflict at #10704.

Keep version and dependencies as 24.06.0-SNAPSHOT in pom.xml

NOTE: this must be merged as create a merge commit

[NvTimLiu]

Only merge commits history, but change nothing on branch-24.06

[NvTimLiu]

build

[jlowe]

This doesn't seem right, as it's missing the changes from #10683. I don't see why we would exclude this from being merged, and we risk dropping the 24.04 changelog completely from branch-24.06 which will get moved to the archives when we release 24.06.

[NvTimLiu]

This doesn't seem right, as it's missing the changes from #10683. I don't see why we would exclude this from being merged, and we risk dropping the 24.04 changelog completely from branch-24.06 which will get moved to the archives when we release 24.06.

Oh yes, let me double confirm what's wrong.

[NvTimLiu]

When I filed this pull request to fix a merge conflict, #10683 was still open.

Only #10681 was targeted for auto-merge into branch-24.06, and it was necessary to resolve the conflict.

Later, after #10683 was merged, another auto-merge was triggered, which included it in branch-24.06 as well.

This indicates that this pull request missed #10683, so it needs to be synced again to incorporate the latest auto-merge update.

[NvTimLiu]

and we risk dropping the 24.04 changelog completely from branch-24.06 which will get moved to the archives when we release 24.06.

We will not discard the changes even if this pull request gets merged without #10638, as the next auto-merge will include #10638 again if it is not merged here.

[NvTimLiu]

Close this pull request and file a new one to align branch-24.06 with the latest branch-24.04.

Followed up by: #10706

[jlowe]

the next auto-merge will include

Yes, but I was concerned there may not be another event to trigger an auto-merge, and thus it would be lost on 24.06. Thanks for resolving this in #10706!