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 (phpc.social)

submitted 6 months ago by beausimensen@phpc.social to c/phpstorm@programming.dev

2 comments fedilink hide all child comments

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.

top 2 comments

sorted by: hot top new old

[-] nCrazed@fd00.space 0 points 6 months ago

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

[-] nCrazed@fd00.space 1 points 6 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

this post was submitted on 21 Aug 2025

3 points (100.0% liked)

PhpStorm

110 readers

10 users here now

A community for the PhpStorm IDE for PHP developers! https://www.jetbrains.com/phpstorm/

founded 2 years ago

MODERATORS

Vacant@programming.dev