git add README.md git commit -m "Resolved merge conflict in README.md" That’s it! You’ve successfully resolved a Git merge conflict using Visual Studio Code. I hope you find this useful.

It also announced GitHub Codespaces, a take on VS Codespaces. The new commands lets developers use the browser-based VS Code as an editor for Git. There's an improvement for dropping files ...