-
-
Notifications
You must be signed in to change notification settings - Fork 497
Description
When using PhpStorm v2024.*, running certain Symfony Flex recipe updates (e.g., composer recipes:update doctrine/doctrine-bundle) causes conflict resolution to fail. The following error is displayed in PhpStorm:
Error loading revisions to merge: cannot read object [Hash] '[File path]'
A bug report has already been submitted to the JetBrains issue tracker (IJPL-158448). However according to JetBrains staff, the error is triggered by a missing blob, potentially linked to the Symfony recipe repository or the update process itself.
I haven't investigated Symfony Flex internals or debugged the issue deeply, so I cannot determine whether this is a problem with Symfony Flex's handling of files during recipe updates or a bug in PhpStorm.
Steps to Reproduce (also refer to the jetbrains ticket for repro):
- Use PhpStorm v2024.* with a Symfony project.
- Run composer recipes:update doctrine/doctrine-bundle (or a similar recipe update).
- Attempt to resolve conflicts through PhpStorm.
- Observe the error: Error loading revisions to merge.
Expected Behavior:
Conflict resolution should work seamlessly after recipe updates without errors.
Actual Behavior:
Conflict resolution fails, displaying an error about being unable to read an object or file.