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 11 months ago by 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.

all 3 comments

sorted by: hot top controversial new old
[–] 1 point 11 months ago

@beausimensen @phpstorm @ramsey have you tried hitting shift twice and typing “resolve conflicts”?

  • permalink
  • fedilink
  • source
    •
    [–] 1 point 11 months ago (1 child)

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

  • permalink
  • fedilink
  • source
  • hideshow 2 child comments
    •