Good points overall, I don’t disagree but I’ll try to give another POV. I think the focus on stashing is that it’s basically an hidden state. If for instance y

Good points overall, I don’t disagree but I’ll try to give another POV. I think the focus on stashing is that it’s basically an hidden state. If for instance you switch back to a branch after a while and you don’t remember you stashed, it will just be lost work. Overall I wish stashed were shown as candidate commits, I actually end up making temporary commits that I amend afterward, most of the time. For the switching between branches during conflict resolution, it might be for people like me who check back and forth reference branches when merging code. For instance a conflict can be between two feature branches I want to merge, and I’d need to check on master what is the current behavior. Or what’s the behavior on other branches that will need merging as well. Currently I’d just open github/gitlab on the other branches and compare from there, but I’d see the value in switching the local files. All in all I feel git is too aggressive in making the user deal with all the details when it could have sane non destructive defaults