we're testing PhpStorm in our company.
Now I have forced a merge conflict, to see the handling in PhpStorm.
PhpStorm is showing me the conflict dialog window with the listed files (buttons 'accept yours', accept theirs', 'merge' and 'cancel').
I select the file and click on 'merge' to resolve the conflicts.
After resolving the conflicts in the next window, the conflict dialog comes to the foreground and then PhpStorm 'hangs'.
I working on a Mac with two desktops. When I switch to the other desktop and switch back, I can see for a very short time (under 1 second) a dialog inside the conflict dialog window with two buttons. But this dialog disappears.
So what I must do to resolve the conflict.