git: How to forget a recorded resolution

If you recorded Show archive.org snapshot a bad fix for a conflict, you can tell git to forget that bad resolution:

git rerere forget your_file.rb

Afterwards, the badly resolved file will still be in your working directory. To get it back with confict markers, say:

git checkout -m your_file.rb

Resolve the conflict again, properly now. ;)