Edvin Malinovskis

nCrazed@fd00.space

I write software for money to support my rock climbing addiction and my dog

0 Posts
2 Comments

Joined 3 years ago

Cake day: November 14th, 2022

You are not logged in. If you use a Fediverse account that is able to follow users, you can follow this user.

OverviewCommentsPosts

Edvin Malinovskis@fd00.spacetoPhpStorm@programming.dev•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
link
fedilink
arrow-up
1·
7 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

link
fedilink

Edvin Malinovskis@fd00.spacetoPhpStorm@programming.dev•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
link
fedilink
arrow-up
1·
7 months ago
@beausimensen @phpstorm do you not get a popup/status line at the top of the window? 🤔

link
fedilink