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
getmethod
nam
log-based-metrics
bootswatch
document-library
watson-openscale
customdialog
project-conversion
samsung-dex
nic
low-level
fb.ui
save-image
dask-delayed
openrowset
simavr
rhino-commons
flask-mysql
qtcharts
yew
google-iap
revit-api
azure-cosmosdb-tables
side-by-side
conv-neural-network
magento-layout-xml
pomelo-entityframeworkcore-mysql
akka-cluster
basex
money-format