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
class-decorator
load-order
spring-cloud-dataflow-ui
liquibase
horizontalscrollview
processor
odbc
panoramas
doxia
filesystem-access
autogen
proxy-authentication
vertx-kafka-client
server.mappath
avmetadataitem
serilog-exceptions
url-parameters
cppcheck
fabricjs
windows-controls
qnames
putchar
getstream-chat
prime256v1
ruby-debug
prettier-vscode
jitsi-meet
android-music-player
applinks
primeng-dialog
