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
pyimgui
jboss7.x
bolts-framework
content-management
swingutilities
srvany
default-arguments
temporary
cloud-foundry
analytical
miui
udpclient
codeship
kubespray
eastl
detekt
remote-input
bump-mapping
distributed-testing
hilo
alphablending
modelandview
svelte-component
drop-database
ppi
lucee
mapbox-studio
centrifuge
jsunit
mysql-python