Is there an easy way to get into @phpstorm’s “git merge and conflict resolution” UI if you’ve started the merge or rebase on the CLI? PhpStorm appears to be aware I’m in the middle of a merge, but opening the files directly just shows the inline <<<< >>>> text markers and not the nice conflict resolution view.
You must log in or # to comment.
@beausimensen @phpstorm do you not get a popup/status line at the top of the window? 🤔
@beausimensen @phpstorm Here’s what that looks like for me. Clicking the green button pops up a dialogue for choosing files that have merge conflicts
@beausimensen @phpstorm @ramsey have you tried hitting shift twice and typing “resolve conflicts”?
