Symfony recipe update conflict resolution fails with phpstorm

[Tib-z]

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.

[Chris53897]

I can confirm this. It did happen only on symfony/asset-mapper.
This was the first one i picked to update.

@Tib-z Did it happen on all recipes or just the first one?

[Tib-z]

As far as I remember for me it happend with doctrine/doctrine-bundle and symfony/twig-bundle (not with the first one update).

[luispabon]

Flex is doing something weird and / or out of spec with the actual git repository itself during updates that's throwing phpstorm off.

[vodevel365]

Same problem with phpstorm with composer recipes:update: Error loading revisions to merge: error: cannot read object d96294e60c51e5ba8b286101189f059fc62a73d8 'config/packages/fos_rest.yaml'.

And object "d96294e60c51e5ba8b286101189f059fc62a73d8" does not exist in .git/objects folder

[pculka]

Ooooh I'm so glad I'm not alone on this.
This happens for me on any recipes:update already. PHPStorm 2024*
PHPStorm 2023.3.8 does not have this issue at all...