One of the more surprising stories of the past year was Microsoft's announcement that it was going to use the Git version control system for Windows development. Microsoft had to modify Git to handle ...

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.

"One" -- as in "One Microsoft" -- is Microsoft's favorite number these days. Late last week, Microsoft officials announced availability of one of the tools created under 1ES. That tool, known as Git ...