1
2
PhpStorm 2025.3 Is Now Out (blog.jetbrains.com)
submitted 11 months ago by to c/phpstorm@programming.dev
3
 
 

Looks like I'm out of the @phpstorm open source licence program, because they only support projects now that are "widely recognized in the developer community". 😔

4
 
 

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.