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.

Sign up for GitHub

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

Jump to bottom

Fix failed merge #11464

Merged
merged 1 commit into from
May 21, 2024
Merged

Fix failed merge #11464

merged 1 commit into from
May 21, 2024

Conversation

derrabus
Copy link
Member

#11422 has not been merged up properly.

@derrabus derrabus added the Bug label May 21, 2024
@derrabus derrabus added this to the 3.1.4 milestone May 21, 2024
@derrabus derrabus requested a review from greg0ire May 21, 2024 08:21
@derrabus derrabus mentioned this pull request May 21, 2024
Merged
@derrabus derrabus merged commit 1127042 into doctrine:3.1.x May 21, 2024
64 checks passed
@derrabus derrabus deleted the bugfix/uow-orderby branch May 21, 2024 10:31
derrabus added a commit that referenced this pull request May 21, 2024
@derrabus
Merge branch '3.1.x' into 3.2.x
22b1f52 
* 3.1.x:
  Fix failed merge (#11464)
  Test with actual lock modes (#11465)
  Backport test for Query::setLockMode() (#11463)
  Fix return type of Query::getLockMode() (#11462)
derrabus added a commit that referenced this pull request May 21, 2024
@derrabus
Merge branch '3.2.x' into 4.0.x
b2a09b9 
* 3.2.x:
  Fix failed merge (#11464)
  Test with actual lock modes (#11465)
  Backport test for Query::setLockMode() (#11463)
  Fix return type of Query::getLockMode() (#11462)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@greg0ire greg0ire greg0ire approved these changes

Assignees
No one assigned
Labels
Bug
Projects
None yet
Milestone
3.1.4
Development

Successfully merging this pull request may close these issues.
2 participants
@derrabus @greg0ire