IBX-12358,IBX-12530: Merged branch '4.6' into 5.0 - #147
Conversation
# Conflicts: # composer.json # tests/integration/IbexaTestKernel.php
Points CI at test-core's own 4.6-to-5.0 merge-up, which carries the DatabaseSchemaHook change this merge-up depends on. Must be removed once that lands.
|
Conflict resolution note — Resolved by keeping 5.0's own tier pins and pulling in only the genuinely new dependency: The other three keys 4.6 has that 5.0 lacks — |
|
The failing Evidence:
The mechanism is that This clears itself: the pin exists only until ibexa/test-core#48 lands, and must be removed before merging — at which point this check should go green. I'll re-run it as part of dropping the temporary commit. |
ibexa/test-core#48 has been merged into 5.0, so the pin to its merge-up branch is no longer needed - and that branch has been deleted, which would break composer install.
|



Caution
This is a merge pull request
Related PRs: