I have gotten some feedback about the perception that the get/checkin/merge conflict resolution workflow for Team Foundation Version Control is a "one-shot" action in Visual Studio and cannot be abandoned and later resumed. Though it is true that the action to resume conflict resolution is somewhat hidden, it is available in two ways:
- From Visual Studio and with the Source Control Explorer opened, select File > Source Control > Resume Conflict Resolution
- From the command line: tf resolve /?
Hope this helps. -Tan