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
aws-codestar
psych
amazon-location-service
zinnia
git-tag
jca
pending-transition
springlayout
aries
puppet-enterprise
sim900
local
chrome-remote-desktop
github-codereviews
freezegun
objc-bridging-header
angular-material-8
jets3t
hypotenuse
kubernetes-upgrade
code-maintainability
pnp-js
textutils
qt-creator
lambda-metafactory
rebol
non-volatile
deviceeventemitter
hasura
geom-col