Ok, you just have a major brain-fart and you did a merge from a remote that has more conflicts than the Sahel region… before you do ANYTHING to your local repo, just do a:

1

git reset --merge ORIG_HEAD

Or, depending upon your git version, you can also:

1

git merge --abort

The merge is gone and that list of 1000+ file conflicts that scrolled endlessly when you hit the return key will not haunt your dreams tonight.