Are you using gitlens in VSCode ? It helps a lot on the normal git flow (including merges)
+1 for gitlens
It has a learning curve, but once you invest the time, it's worth the savings.
We’re a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.