Undo/Redo Conflict Resolution action in TFS

Question

Is there a way to undo/redo a conflict resolution in VS2013/TFS?

Accidentally clicked "Use Local Changes" when really meant to do "Resolve Conflicts". Since "Use Local Changes" was clicked the changes are all intact. Is there a way to force VS2013/TFS to resolve conflicts again so this time we can merge?

Answer 1

1. Shelve all the changes
2. Undo checkout all changes
3. Unshelve your Shelveset.

The dialog to resolve conflict will appear when you try to check-in

Answer 2

Assuming you have no other pending changes than the merge (always check in or shelve any pending changes before you do a merge), you can either undo all changes and do the merge again, or undo the changes of a single file and just merge that file. Do to the latter:

1. Undo the pending change in your target branch
2. Locate the file in your source branch and select merge...
3. Select the same file in your target branch
4. Redo the conflict resolution