also, git stash is your friend. and after you stash, it isn't always 'git pop', but possibly 'git apply' There are times when I have three (or more) stashes st

also, git stash is your friend. and after you stash, it isn't always 'git pop', but possibly 'git apply' There are times when I have three (or more) stashes stacked up on any given branch. I know I have reached a cohesive set of changes when I am ready to 'git stash drop' every one.