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.

95d919c (HEAD -> master) HEAD@{4}: commit (initial): First commit. In contrast, the Git log only shows one commit on the master branch: $ git log --pretty=oneline 95d919c (HEAD -> master) First commit ...

Adhere to the 72-character limit. Another rule about how to write a git commit message properly is to limit the body width to 72 characters. Now, this doesn't mean you must set your text editor to ...