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
bibliography
jpql
riot.js
sicstus-prolog
radare2
learndash
sendgrid-templates
html5-appcache
zpl
gsm
ktorm
media
smartformat.net
monogame
code128
niagara-ax
nscoder
graphql-subscriptions
random-effects
tinylog
activerecord-postgis-adapter
lua-scripting-library
flv
potrace
fromcharcode
sitecore-workflow
machine.config
inline-images
stretching
with-statement