Search code examples
phpstorm

Visual tool to resolve merge conflict with PHP Storm?

Is there a visual tool to resolve merge conflict with PHP Storm?

I found this documentation but it doesn't seem to be what im after https://www.jetbrains.com/phpstorm/help/resolving-text-conflicts.html

I go the menu and go VSC / Git / Resolve conflicts then I get the window below. As you can its not a visual diff.

enter image description here

Solution

  • Clicking on the merge option will bring up the visual tool.

    Once there, you will have the same tool appear as the local history or compare differences tools.

    You need to explicitly accept or ignore each individual change when you do the merge, although there is the option to merge while ignoring any remaining differences, which results in the common ancestor + whatever changes you applied.