I'm using GitExtensions windows software to work with git and i had many trouble configuring it to work with Idea's community edition, to use it as a merge tool
compilation
binlog
zappa
tonic
overlay-view
two-connection-limit
mat-input
shader-graph
httpbuilder
suitescript1.0
highchartstock
axe
qwidget
h.264
powershell-3.0
android-mvvm
laravel-horizon
affinity
web-administration
yowsup
fody-costura
salesforce-flow
cbc-mac
stimulus-reflex
gis
ef-code-first
pysmt
thor
opencv-dnn
uicolorpickerviewcontroller