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
feature-store
compiler-directives
bokehjs
relative-addressing
sailfish-os
actionview
distributed-cache
digit
placement-new
dj-rest-auth
prettier-vscode
android-datepicker
quest
speedglm
wifip2p
aws-iot-events
avdepthdata
webinar
logistic
mptt
project-navigator
webpack-bundle-analyzer
r.java-file
pynsist
llvm-c++-api
openmaptiles
maplibre-gl
ng-mocks
jexceljs
cpuset