Skip to content

Conversation

@sabbott1877
Copy link
Contributor

This PR includes a test and fix for the issue in https://hibernate.atlassian.net/browse/HHH-19473


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.


…ns to resolve issue with mismatched generated method signatures.
@sabbott1877
Copy link
Contributor Author

I found the issue and fixed on 6.6, so I branched off of that but it seems that's not an option for merge. Should I just rebase and retarget to main?

@mbellade
Copy link
Member

found the issue and fixed on 6.6, so I branched off of that but it seems that's not an option for merge. Should I just rebase and retarget to main?

I would suggest checking out main and cherry-picking your changes on it in a new branch, then opening a new PR. Rebasing to main will cause more trouble than it's worth.

Also, as this is a bug-fix, we can evaluate whether it's worth merging on 6.6, so please keep this PR as is. Thanks for working on this.

@sabbott1877
Copy link
Contributor Author

Created #10187 into main branch

@mbellade mbellade added the 6.6 label May 20, 2025
@mbellade mbellade merged commit d2d2186 into hibernate:6.6 May 22, 2025
35 of 40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants