I've tried the suggestions in posts under this heading to no avail. I also am trying to multiple commits back to a particular point in my project. My latest attempt was: git revert --no-commit f8fae3b..HEAD I got the following error:
error: your index file is unmerged
fatal:revert failed