How to quickly resolve GIT conflicts?

Question

PHP

Greetings to all gentlemen.
Tell me, when you are working on a project, you did a git pull from a remote repository, and a bunch of conflicts came to you.
How can you quickly see which places are conflicting and resolve them quickly?
There are a lot of tools, eyes run wide, and all with their own tricks

Answer 1

from the console - meld as default conflict editor.
phpStorm has a nice built-in toolkit