How I do this:
- I’m on branch X
- I make changes (including adding and removing files)
- don’t commit these changes to branch X
- stash changes
- checkout branch master
- apply stash so that everything look like the stash
How to resolve all conflicts with one command so that master looks identical to the stash without having to review file by file?
I tried something using theirs and the app didn’t work after. I had to recover my stash. I was fortunately able to recover it but when I recovered it it got applied as a commit to branch X.