[Bug]: Git rebase workflow becomes broken in PHPStorm if a merge conflict exists in _ide_helper_models.php

[captainjmac]

Bug description

I've recently switched from using barryvdh/ide-helper to the Laravel Idea plugin.

On two separate occasions now I've encountered problems where PHPstorm doesn't seem to be able to conduct rebasing/merges correctly. On both of these occasions the reason appears to be that it PHPStorm is unaware of merge conflicts existing in the file _ide_helper_models.php which was previously created by barryvdh and exists in our repo.

I'm guessing that laravel-idea might contain some code which prevents phpstorm from being aware of these files generated by barryvdh/ide-helper to avoid clashes when users migrate from barryvdh/ide-helper to the laravel-idea plugin.

If i'm correct, it seems to have this unfortunate side effect of also preventing phpstorm's rebase feature from being aware of merge conflicts in this file, and prevents the rebase workflow from functioning properly.

Plugin version

11.3.0.252

Operating system

Linux

Steps to reproduce

No response

Relevant log output

[adelf]

Hello.

I'm guessing that laravel-idea might contain some code which prevents phpstorm from being aware of these files generated by barryvdh/ide-helper to avoid clashes when users migrate from barryvdh/ide-helper to the laravel-idea plugin.

No. We don't prevent anything like that. Looks like it's a git issue...

[gorbunov]

Please check, if you have same problems with console git merge, or with plugin disabled. This likely either git issue or or phpStorm git-client issue. If you have more info relating to the plugin being the actual culprit, feel free to reopen issue, and please provide some more reproduction data: logs or screenshots highlighting the problem.