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
wix3
jmeter-3.2
directx
react-reducer
ordered-set
for-loop
android-task
grayscale
macos-big-sur
byte-code-enhancement
netbeans-platform
sql-server-linux
process-mining
mysql-connector-python
freemarker
session-variables
automation-testing
gumstix
term-suggester
dgl
biml
codepages
muenchian-grouping
sticky-footer
ssrs-subscription
project-reference
google-apps
idoc
android-seekbar
micrium