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

[PR #12271] [MERGED] Merge 3.5.x up into 3.6.x #13635

New Issue
Open
opened 2026-01-22 16:17:53 +01:00 by admin · 0 comments
admin commented 2026-01-22 16:17:53 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/doctrine/orm/pull/12271
Author: @greg0ire
Created: 11/11/2025
Status: ✅ Merged
Merged: 11/11/2025
Merged by: @greg0ire

Base: 3.6.x ← Head: 3.6.x

📝 Commits (3)

  • 37f76a8 Undo merge from 3.6.x into 3.5.x
  • f18de9d Merge pull request #12269 from greg0ire/3.5.x
  • 2c41cc7 Merge remote-tracking branch 'origin/3.5.x' into 3.6.x

📄 Description

Using -s ours so as not to undo all the work done in this branch.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/doctrine/orm/pull/12271 **Author:** [@greg0ire](https://github.com/greg0ire) **Created:** 11/11/2025 **Status:** ✅ Merged **Merged:** 11/11/2025 **Merged by:** [@greg0ire](https://github.com/greg0ire) **Base:** `3.6.x` ← **Head:** `3.6.x` --- ### 📝 Commits (3) - [`37f76a8`](https://github.com/doctrine/orm/commit/37f76a8381cbca47c53dfd56909ffc90bc51192d) Undo merge from 3.6.x into 3.5.x - [`f18de9d`](https://github.com/doctrine/orm/commit/f18de9d569f00ed6eb9dac4b33c7844d705d17da) Merge pull request #12269 from greg0ire/3.5.x - [`2c41cc7`](https://github.com/doctrine/orm/commit/2c41cc7f1cafb25c35376b52f32c550a76481534) Merge remote-tracking branch 'origin/3.5.x' into 3.6.x ### 📄 Description Using `-s ours` so as not to undo all the work done in this branch. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
admin added the pull-request label 2026-01-22 16:17: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#13635
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?