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
six
cpack
ssis
loadoptions
azure-active-directory
use-context
grails-5
foreman
dataprovider
flatbuffers
wpallimport
exiv2
page-jump
android-inputtype
cross-thread
picocontainer
satpy
rcurl
azure-notebooks
nstablecellview
fileversioninfo
msal
cloudwatch
avaudiounit
uwp-maps
hdevelop
integration
68000
vertical-alignment
windows-wpp