Resolve Selected Conflicts Dialog (what do the options mean)?

So I'm trying to work though a baseless merge. I'm either doing something wrong, or it's just really tough -- every file is a conflict -- even if they are perfectly identical (fc /b indicates identical), and the "Auto Merge All" option fails because some of the files in the tree are binary (it's a web site, there are jpgs in there)

Wow this is hard.

So I have the resolve conflicts dialog open, and I have multi-selected some of the files that are in conflict, and then I clicked Resolve...

I'm looking at the Resolve Selected Conflicts dialog, and I'm at a bit of a loss.

There are 3 options: "Merge Changes For Me" (won't work because the files are binaries)

"Undo My local changes", "Discard Server changes".

I don't understand what these last 2 options mean. I did the merge on my machine, and I have not committed yet, so there are no "server changes" both sets of files are local.

So which option means "keep the changes in the target branch", and which one means "replace the files in target with the ones in source"

Hi Eugene:

I'm afraid that doesn't quite help: I don't have a check-in conflict, I have a merge conflict. Both versions of the file are local (you could also look at it the other way and say that both are on the server - they haven't been edited locally, they are being merged.

I think that I found the answer to my question in the command line reference for tf resolve:

Thanks Eugene -- reading the doc now!