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
intake
achievements
avmutablevideocomposition
contact-center
asp.net-identity-2
java1.4
openshift-origin
offline-browsing
idml
pre-authentication
arena-simulation
anonymous-types
multiple-value
msbuild-projectreference
insertion
react-chartjs-2
swingx
emulation
window-managers
pdf-manipulation
android-wake-lock
pajek
appjs
huawei-ads
x-xsrf-token
express-session
stylesheet
tweak
bson
sonar-runner