Visual Studio Code how to resolve merge conflicts with git?
Visual Studio Code how to resolve merge conflicts with git?
Visual Studio Code how to resolve merge conflicts with git?
Re: Visual Studio Code how to resolve merge conflicts with git?
After trial and error I discovered that you need to stage the file that had the merge conflict, then you can commit the merge.