error: Reverting is not possible because you have unmerged files

git git-revert
sashoalm picture sashoalm · Jan 8, 2018 · Viewed 16.2k times · Source

When trying to revert a specific commit in git, I'm getting this error:

$ git revert aaaf93201a28a57d540d633b1b723b8e513a47ed
error: Reverting is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm '
hint: as appropriate to mark resolution and make a commit.
fatal: revert failed

Is this about merge conflicts? But why does it say "unmerged files" in that case?

Answer

boonu picture boonu · Dec 9, 2019

If you want to revert to the previous state of your work do:git merge --abort

Related questions

How do I revert a Git repository to a previous commit?

How do I revert from my current state to a snapshot made on a certain commit? If I do git log, then I get the following output: $ git log commit a867b4af366350be2e7c21b8de9cc6504678a61…

Read More
How do I use 'git reset --hard HEAD' to revert to a previous commit?

I know that Git tracks changes I make to my application, and it holds on to them until I commit the changes, but here's where I'm hung up: When I want to revert to a previous commit I use: git …

Read More
Rollback to an old Git commit in a public repo

How can I go about rolling back to a specific commit in git? The best answer someone could give me was to use git revert X times until I reach the desired commit. So let's say I want to revert …

Read More