Resolving Conflicts
Answered
Hi, I have a problem while resolving conflicts in the webstorm in the merge. I only see the middle column without any other versions. Srenn, I'm joining. This applies to html and js files.
Someone is able to help
Please sign in to leave a comment.
Do I get it right that it happens with html and js files, but works ok for other files?
Could you please submit an issue to https://youtrack.jetbrains.com/issues/IDEAwith logs attached after reproducing the issue?
Thank you for your answer. So this problem occurs with JS and HTML files, the rest of which, for example, PHP works correctly. I made the application