I've found the Visual Studio git integration to be not good with large solutions, just slows everything down. So I have it disabled in my projects. What I do:

I've found the Visual Studio git integration to be not good with large solutions, just slows everything down. So I have it disabled in my projects. What I do: I use GitHub desktop to get everything configured, then use the PowerShell command line to do all my work. Merge conflicts are fixed with VS Code.