GitHub Desktop 1.5 makes it easy to resolve frustrating merge conflicts

Image may be NSFW.
Clik here to view.
GitHub today announced a major update to its visual Git client, GitHub Desktop ... several new performance and usability improvements. Adding, creating, and cloning repositories, for example ...