How to resolve git merge conflicts using VS Code

You often come across git merge conflicts working on a project in a team. Git merge conflicts arises when multiple people change the same file at the same time.

This is a quick tutorial showing you how to resolve git merge conflicts using Visual Studio Code. This tutorial uses a simple git merge conflict example for demonstration. I explain the difference between and use cases of Accept Incoming Change and Accept Current Change.

I hope you find it helpful!

#git #vscode #mergeconflict