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.

wait, what IS that thing? For the uninitiated, that giant statue of a feline-cephalopod hybrid is Octocat, GitHub's logo. Octocat isn't just a logo or a mascot — it's an inside joke shared with ...