Community driven content discussing all aspects of software development from DevOps to design patterns. The magic of Git and GitHub Desktop is that it hides much of the Git plumbing from the user, so ...
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.