git: error: you need to resolve your current index first [duplicate]

Question

I was trying to merge a branch with my branch, but had merge conflicts.

After seeing the conflicts, I've decided to revert my branch, but am unsure how to do so, as my usual approach of running the following doesnt seem to work to reset my branch

git fetch origin
git reset --hard origin/BRANCH

How can I do this?

Answer 1

Found out you can abort your merge using:

$ git reset --merge

from this similar question/answer