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
dremio
bucket
affix
django-viewflow
location
productbuild
cachegrind
react-dates
use-reducer
isolation-forest
libgc
ansistring
google-cloud-spanner-emulator
arduino-nano
mlpack
blobstore
sap-solution-manager
reportingservices-2005
robocopy
oraclereports
outlook-object-model
polish-notation
android-resolution
sublist
xtraeditors
shim
page-load-time
wii-u
websphere
ansible-handlers