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.

A git stash pop conflict can cause multiple problems during development. Take these steps as you learn to merge and resolve git stash pop conflicts when they arise.