[nawitus]

>Getting a visual representation of a conflict helps you resolve it more confidently.

You can launch e.g. kdiff3 when necessary to resolve conflicts visually without using a GUI git clint.