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.

Conflict in the workplace is not always a bad thing. Ignoring it, however, always is. The good thing about conflict is that it’s always resolvable. Learn how to overcome and prevent negative ...