The merge conflict code lens
You can quickly resolve merge conflicts directly in VS Code. Use the merge conflict code lens to pick between your local changes or the incoming changes, make a few more edits, then commit the merge using the SCM view.
You can quickly resolve merge conflicts directly in VS Code. Use the merge conflict code lens to pick between your local changes or the incoming changes, make a few more edits, then commit the merge using the SCM view.