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
app.js
worldpay
persian
dir
application-name
wheelcollider
copytree
hdpi
paginateddatatable
vaadin7
flutter-animatedlist
jsdoc2md
google-api-linter
primitive-types
persistence.xml
image-caching
font-scaling
infobip
msxml6
image-editing
service-reference
django-channels
spire.xls
google-analytics-api
netflix-archaius
arviz
opengl-es-1.1
haskell-warp
options
taskbar