chucker

joined 3 years ago

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 in c/phpstorm@programming.dev

[–] chucker@norden.social 1 points 5 months ago

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