this post was submitted on 21 Aug 2025
3 points (100.0% liked)

PhpStorm

110 readers
5 users here now

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

Copyright © 2024 JetBrains s.r.o. PHPStorm and the PHPStorm logo are registered trademarks of JetBrains s.r.o.

founded 2 years ago
MODERATORS
Vacant@programming.dev
3
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 5 months ago by beausimensen@phpc.social to c/phpstorm@programming.dev
3 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.

you are viewing a single comment's thread
view the rest of the comments
[–] nCrazed@fd00.space 1 points 5 months ago (1 children)

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

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