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
autolink
gota
python-applymap
dbms-crypto
google-font-api
appsync-apollo-client
parentheses
inimage
samsung-galaxy-watch-4
tcplistener
qpainter
splistitem
digital-logic
oracle.manageddataaccess
datanucleus
caplog
raspberry-pi-pico
findstr
bluemix-app-scan
wmd
pipedream
zeplin
printf-debugging
brace-expansion
keyhook
rulers
halt
kimurai
isomorphic-javascript
tomcat-dbcp