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
rule
sharepoint-upgrade
posthoc
pkware
phonegap-build
sql-fetch
redirects
angular-breadcrumb
text-chunking
.net-core-5-preview-2
dhtmlx
google-reporting-api
django-markdown-deux
unauthorized
wing-ide
htmllint
amasty
codeception
self-organizing-maps
ucanaccess
pspdfkit
bootstrap-4.1.x
auto-increment
jfif
rete
retransmit-timeout
arrange-act-assert
slurm
java-11
jekyll