Settings and activity
2 results found
-
31 votes
An error occurred while saving the comment -
17 votes
An error occurred while saving the comment Randall Hackel commentedHaving used Scooter Software's BeyondCompare for years (and a bit of kidff3 when forced to do so), I can't find the Code Compare usable for merging without this feature.
I love the Visual Studio integration, but the 3-way merge just isn't viable at present.
Doesn't seem that it would be that hard to add...Randall Hackel supported this idea ·
This is indeed a brilliant feature, and already freely available in Microsoft's TFS Power Tools:
https://visualstudiogallery.msdn.microsoft.com/f017b10c-02b4-4d6d-9845-58a06545627f
Excerpt from the tfpt.exe documentation: "UU (Undo Unchanged) Command
You can use the UU command to undo unchanged files, including adds, edits, and deletes."
I've used it. It works fine.