overview for nCrazed

Is there an easy way to get into '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 in c/phpstorm@programming.dev

[–] nCrazed@fd00.space 1 point 11 months ago

@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

parent

context

Is there an easy way to get into '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 in c/phpstorm@programming.dev

[–] nCrazed@fd00.space 1 point 11 months ago (1 child)

@beausimensen @phpstorm do you not get a popup/status line at the top of the window? 🤔