chucker comments on 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?

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

submitted 1 year ago by beausimensen@phpc.social to c/phpstorm@programming.dev

1 comment 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

[–] chucker@norden.social 1 point 1 year ago

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

permalink

fedilink

source