While slightly different than the original complaint I hate how `git stash pop` handles conflicting files. Instead of creating file.orig file.remote ... as other commands do, it immediatly puts >>>> everywhere <<<<, leaving a mess if you are not careful (and commit/push/run broken code).