I\'m using VS Code with Git - it\'s in portable location C:\\_DEV\\bin\\git and is also added to Windows PATH so it works just fine with no remotes.
I have a OneDriv
I had the same problem with visual studio 2017. My solution was to close visual studio, then open Visual studio CODE and merge the files there.