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.

Sublime HQ – the folks behind the excellent text editor Sublime Text – has released a code editor for developers that focuses on a clean interface for coding and solving git merges. It’s called ...