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
ng-content
pinax
apparmor
archiva
simple-framework
poison
wpa2-psk
bitmapshader
timeshift
packagereference
lts
arb
spectra
init-only
cornerstone
outlook-graph-api
tampering
gwidgets
jenkins-x
audio-player
nslocalizedstring
python-collections
javascript-oscillator
feasibility
objectid
google-sso
android-install-apk
fixeddocument
missingmethodexception
adobe-scriptui