doctrine/archived-orm
1
0
Fork 0
mirror of https://github.com/doctrine/orm.git synced 2026-03-23 22:42:18 +01:00
Code Issues 5.3k Packages Projects Releases 100 Wiki Activity

[PR #10457] Merge 2.15.x up into 3.0.x #12381

New Issue
Closed
opened 2026-01-22 16:13:52 +01:00 by admin · 0 comments
admin commented 2026-01-22 16:13:52 +01:00
Owner
Copy Link

Original Pull Request: https://github.com/doctrine/orm/pull/10457

State: closed
Merged: Yes

As you predicted @derrabus, that one was quite painful. I used https://github.com/mhagger/git-imerge, but still.

Note that I'm not even merging the tip of 2.15.x, but the commit right before we bump Psalm to 5.5.0, so there will be a need for another merge up after this one. Just thought it would be best to deal with the Psalm bump separately.

Cc @mpdude

**Original Pull Request:** https://github.com/doctrine/orm/pull/10457 **State:** closed **Merged:** Yes --- As you predicted @derrabus, that one was quite painful. I used https://github.com/mhagger/git-imerge, but still. Note that I'm not even merging the tip of 2.15.x, but the commit right before we bump Psalm to 5.5.0, so there will be a need for another merge up after this one. Just thought it would be best to deal with the Psalm bump separately. Cc @mpdude
admin added the pull-request label 2026-01-22 16:13:52 +01:00
admin closed this issue 2026-01-22 16:13:53 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
BC Break
Bug
Can't Fix
Deprecation
Documentation
DQL
Duplicate
Failing Test
Hacktoberfest
Improvement
Improvement
Incomplete
Invalid
Missing Tests
New Feature
PR Created
pull-request
Mirrored from GitHub Pull Request
 Question
Regression
Status: Waiting feedback
Waiting feedback
WIP
Won't Fix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
admin
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: doctrine/archived-orm#12381
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?