git: error: you need to resolve your current index first

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?

https://stackoverflow.com/search?q=%5Bgit-merge%5D+abort – phd Jul 15 '19 at 18:31 — phd, Jul 15 '19 at 18:31

score 38 · Accepted Answer · answered Jul 15 '19 at 16:57

38

Found out you can abort your merge using:

$ git reset --merge

from this similar question/answer

answered Jul 15 '19 at 16:57

Brad Parks

66,836
64
257
336

3

Keep in mind (and I know this will be obvious to some people), this will clear you existing changes. – Byron Coetsee Mar 30 '22 at 19:36

git: error: you need to resolve your current index first

1 Answers1

Linked