https://www.andreaschiavini.com/posts/git-preview-conflicts-without-touching-the-working-copy/
Git: preview conflicts - Andrea Schiavini