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
alphabetical
spring-webtestclient
feathericons
pureftpd
analysisservices
aws-sftp
gerrit-trigger
uft14
envsubst
rx.net
tidb
autofill
junit5-extension-model
coq-linter
android-swipe
qtserialport
data-linking
android-safe-args
prestashop-1.7
webservicehost
wit-ai
box-shadow
transcode
adgroup
mongodb4.0
powercli
aws-cloudshell
android-savedstate
linear-equation
fedora20