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.

Unlock the full InfoQ experience by logging in! Stay updated with your favorite authors and topics, engage with content, and download exclusive resources. Cory Benfield discusses the evolution of ...

GitHub Desktop 2.0, an upgrade to the GitHub client for Windows and MacOS, adds support for rebasing and stashing to allow context switches and keeping a commit history clean, respectively. The goal ...