Microsoft released a new version of Visual Studio Tools for Git yesterday, that adds some welcome functionality. The update is version 0.8.0.0 (so it's still in the preview stage). The two key ...

Any merge conflicts can be solved through a guided visual process, and a three-view merge editor shows the expected resulting code as the conflicts are individually solved.

Visual Studio Code 1.70, the latest release of Microsoft’s popular code editor, promises easier title bar customization and Git merge conflict resolution, among a host of other improvements.

GitHub today announced a major update to its visual Git client, GitHub Desktop. Version 1.5 introduces a new way to resolve merge conflicts, which are inevitable when working on a project with a team.