Why does Git remember and use a conflict resolution from an aborted rebase without asking me?

Question

I did a rebase on my branch foo

git rebase master

Did some conflict resolutions, then decided I didn\'t want to do it, and aborted

Answer 1

use git checkout --conflict=merge -- your_file to get the version of the file with conflicts

Answer 2

You can use rerere's "forget" function to erase a remembered conflict resolution.