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
static-html
qwik
entity-framework-core-6.0
rmark
dynamic-typing
extra
mamp-pro
qaudiorecorder
informatica
mongo-go-driver
launchdarkly
atg
resolve-url-loader
es6-module-loader
pivotaltracker
heroku-addon
storekit
angular-material-7
scandir
azure-sdk-js
form.io
synchronization
pac
ui-codemirror
xmpphp
application-security-group
dbconnect
liclipse
binary-decision-diagram
neo4j-ogm