Resources for using the popular distributed source code control and collaboration tools Git and Mercurial on Windows.

Learn how to resolve Merge Conflicts in Git using this guide. Merge Conflicts can occur if the same parts of code are changed in different branches.

Git in Visual Studio Code With Git and GitHub everywhere at Microsoft, it’s also built into Microsoft’s developer tools and into how developers build apps on Windows and for Azure. When you ...

GitSync for Plastic SCM has been released with support for native Git network protocols and Visual Studio 2012 support.

Visual Studio Code now supports discovery for nested Git repositories and improves autoscrolling, among other features.

Source: Microsoft The new Git tooling is an important development in Visual Studio, especially considering other GitHub-related features released this year (like GitHub Actions for Azure).

Sublime Merge includes powerful features like an integrated git merge tool, the ability to search for specific commits, command line integration, code and file history, and syntax highlighting.

Visual Studio Code, the popular development text editor and IDE, has rolled out its big July 2025 release. The v1.103 update adds new Git and terminal integrations, better language support, and more.

Windows switch to Git almost complete: 8,500 commits and 1,760 builds each day The Windows team's migration to Git is almost complete.