How to unmerge branches?

Question

git

Dropped 2 branches.
git merge
Then I merged the files incorrectly and hid them using git stash, how do I clean up the files from git stash and merge the commits again?

Answer 1

git merge --abort
git stash drop