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.

There's always the chance that a merge conflict might occur when a developer updates or overwrites a file. Here's how to merge and resolve git stash pop conflicts when they arise, and clean up the ...