Inherently distributed in nature, every local commit made to a Git repo will make its way to the shared, central repository, as soon a developer issues a push command. But this isn't always ideal.

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 ...