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
appcompatdelegate
quickselect
winforms
dragtarget
evaporate.js
iframe
webrtc-android
liveservertestcase
clientcredential
listen
fixed-length-record
oracle-apps
initializer
header-row
adapter
logonserver
data-handling
unchecked-cast
zdog
react-native-nfc-manager
avi
uaprof
servicepacks
virtual-server
swish
opendata
android-viewpager2
hibernate-envers
glibmm
st