There's a (relatively) new feature in Git that makes the conflicts even better. This write-up is deep and super comprehensive: https://www.eseth.org/2020/merg

There's a (relatively) new feature in Git that makes the conflicts even better. This write-up is deep and super comprehensive: https://www.eseth.org/2020/mergetools.html https://www.eseth.org/2020/mergetools.html `git config mergetool.hideResolved true` enables the modern git mergetool behavior.