Git undo auto merging on a specific file only, not the whole branch

Question

Is there a way I can undo a auto-merge of one file that has been changed instead of the whole branch in Git?

I want to undo this merge:

Auto-mergi

Answer 1

You probably want git checkout commit-ish -- file.