Fork me on GitHub

I'm trying to rebase my branch onto master in magit, and I hit a spot where some other party deleted a file that I have committed an edit to. Magit stops the rebase and tells me to fix it. I now have the file marked under "Staged changes" as "umerged <filename> (deleted by us)". How do I proceed? I just want to choose their version (delete the file).


Think I found a way - x on the file gives me a prompt to use ours, theirs or something else.