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
custom-exceptions
triples
ssms-addin
camino
confluent-control-center
dbi
format-patch
modulation
gadt
nlp
gcp-snapshot
react-server
geojson
bookmarks
export-csv
google-cloud-networking
html5-animation
launch-services
jsoup
communication-protocol
domexception
r-future
filesaver.js
adafruit
gameplay-kit
htaccess
fable-f#
aws-regions
fringe
nock.js