I don't like VS Code git integration, WebStorms (JetBrains) diff/merge tool with syntax highlighting is superior.