I made some changes to my branch and realized I forgot I had stashed some other necessary changes to said branch. What I want is a way to merge my stashed changes with the
What I want is a way to merge my stashed changes with the current changes
Here is another option to do it:
git stash show -p|git apply
git stash drop
git stash show -p will show the patch of last saved stash. git apply will apply it. After the merge is done, merged stash can be dropped with git stash drop.