However, it is possible to alter this behavior and stash untracked files with the right git stash save and push options. The trick is to use the --include-untracked option or for brevity, the -u alias ...

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