The installation of VS Code does not add Git into the mix, so you must do it manually. To install git on a Ubuntu-based distribution, open a terminal window and issue the command: ...

mkdir myproject cd myproject git init (Create and edit index.html) git add index.html git commit -m "Created index.html" You created and navigated to a new directory for your project, then initialized ...

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.

You can go back to your commit of CoolApp 1.0, make the patch, and send that code into production as CoolApp 1.1—all without disturbing or adding to the series of commits leading to CoolApp 2.0 ...