Comment by stouset

Forgetting which branch a set of changes was originally stashed on, having stash conflicts (and forgetting to drop the top of the stash once you've fixed it) are common.