NotificationsYou must be signed in to change notification settings
Fork9.6k
Star30.4k

[Console] remove conflict rule#60360

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Merged

fabpot merged 1 commit intosymfony:7.3fromxabbuh:pr-60076

May 7, 2025

Merged

[Console] remove conflict rule#60360

fabpot merged 1 commit intosymfony:7.3fromxabbuh:pr-60076

May 7, 2025

Conversation

Copy link

Member

xabbuh commentedMay 6, 2025

Q	A
Branch?	7.3
Bug fix?	no
New feature?	no
Deprecations?	no
Issues
License	MIT

remove conflict rule

8084241

xabbuh requested a review fromchalasr as acode owner

May 6, 2025 12:26

carsonbot added Status: Needs Review Console labels

May 6, 2025

carsonbot added this to the7.3 milestone

May 6, 2025

yceruto approved these changes

May 6, 2025

View reviewed changes

carsonbot added Status: Reviewed and removed Status: Needs Review labels

May 6, 2025

Copy link

Member

GromNaN commentedMay 6, 2025

Why was there this constraint and why are you removing it?

Copy link

MemberAuthor

xabbuh commentedMay 6, 2025

@yceruto added it in#60076 but it turned out that the conflict rule doesn’t seem to be necessary for the test suite to pass.

Copy link

Member

I can’t recall the exact reason I introduced this conflict, but based on the nature of that PR, I assume it was related to a deprecation failure. I might be overlooking something, but since@xabbuh confirmed that the failure no longer occurs, I’m fine with removing it.