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
inversion
apache-dubbo
atmega32
plesk-onyx
android-titlebar
odata4j
jpbc
tampering
cartesian-product
declarative-services
platform.sh
merlin
absinthe-subscription
nsnotificationcenter
s390x
tensorflow-agents
authorize.net-cim
lightgraphs
angular-fullstack
footer
ifc
pyhive
sanitizer
location-provider
botkit
sql-agent
sencha-touch-2
activeresource
on-location-changed
request-mapping