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
sorbet
android-snackbar
dlt-daemon
opencv3.3
procrustes
lgpl
enumeration
metis
facet-wrap
ktrain
nested-checkboxes
solr-operator
lxd
email-bounces
multiple-choice
packages.config
oracle-service-bus
chancejs
oc4j
qmediarecorder
ob-get-contents
devise-confirmable
video-player
parallel-processing
nuget-spec
intel-mxnet
google-postmaster
xfce
spir
federated-learning