I had a lot of local changes.
I just accidentally did
git merge another_branch
git reset --hard HEAD^
If the changes had never been committed/stashed/staged, then you're out of luck. If they have, then you should be able to git your changes back by looking for them in git reflog
.