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
exit
usersession
sanitizer
system.array
ngui
nmake
graph-neural-network
xslf
jbossfuse
linear-search
countries
tld
memoryanalyzer
r-tree
mfmailcomposeviewcontroller
simscape
haproxy
skype-bots
django-viewsets
content-pages
amq-6
name-lookup
callr
env-file
mediawiki-visualeditor
azure-storage-wagon
rive
error-checking
speex
xcode-bots