Merge conflicts in Visual Studio Code

While working in Visual Studio Code fairly heavily recently I was impressed to see they make source control conflict resolution available directly in the IDE!

Amazingly I can’t recall other IDEs that do this. Great work!

Leave a Reply

Your email address will not be published. Required fields are marked *