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
src
r-daisy
pycups
allowed-origin
junction-table
alembic
google-jax
google-cloud-network-load-balancer
react-google-maps-api
xquery-3.0
operationqueue
excelquery
keyset-pagination
ggdendro
distributed-algorithm
textnode
controller-advice
sorted
flutter-hooks
python-re
elyra
fody
magic-function
system.reflection
privileged-functions
httpservice
apple-configurator
slate.js
sequence-generators
load-balancing
