The most useful part was the comment: > I think it’s worth emphasising that stash stores just your changes and not a snapshot of the entire tree. This means th

The most useful part was the comment: > I think it’s worth emphasising that stash stores just your changes and not a snapshot of the entire tree. This means that you can create your stash on one branch and then pop it onto another branch. When you pop from the stash a merge is done including any conflict resolution that may be necessary.