Visual Studio (with Team Foundation Server) - How to get back to "Resolve" screen?

Question

Hi,

I started resolving conflicts in a merge and then had to quit to set something up. Now I don't see any way to get back to the stupid conflict resolution window. If I try to merge again it just gives me a bunch of warnings about the pending merge I already have? This is in Visual Studio 2005.

Answer 1

The merge will have been rolled back if you canceled out of it. Can you run tf merge from a visual studio command line?

Answer 2

If it was rolled back then how come doing "Merge" again doesn't work, I have to undo my whole changelist?