I need some tools for fixing git conflicts inside of PhpStorm

Viewed 23

Working with PhpStorm 2021 I use console for all git commands. But fixing git conflicts inside of PhpStorm I found it unconvinient to fix it one by one, especially when working with big file and I need to select one choice for all conflicts. Are there some plugins for conflicts fixing inside of PhpStorm ?

Thanks!

0 Answers
Related