git stash -> merge stashed change with current changes

Question

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

Answer 1

you can easily

1. Commit your current changes
2. Unstash your stash and resolve conflicts
3. Commit changes from stash
4. Soft reset to commit you are comming from (last correct commit)