How do I configure TFS to work with various merge tools

tfs merge winmerge beyondcompare
Justin Dearing picture Justin Dearing · Aug 21, 2009 · Viewed 7.6k times · Source

Originally the question was "How do I configure WinMerge as the compare and merge tool for TFS". However, I am changing it because TehOne answered this more general form of the question.

I would have though this would have been asked already on Stackoverflow. I found the answer elsewhere, but I am asking/answering here. It's now a community wiki.

Answer

TehOne picture TehOne · Aug 21, 2009

When I was looking for how to do this, I found this post to be invaluable: http://blogs.msdn.com/jmanning/articles/535573.aspx

Related questions

how to merge two changesets only (TFS)

You see 162489 and 162990, How can I merge them ?

Read More
Entity Framework Merge Nightmare

We've adopted the Entity Framework and we're finding that when multiple people make isolated changes in their individual source control branches, there are massive conflicts when they come together in a merge, resulting in broken model files. We're leaning in …

Read More
Branching and Merging Strategies

I have been tasked with coming up with a strategy for branching, merging and releasing over the next 6 months. The complication comes from the fact the we will be running multiple projects all with different code changes and different release …

Read More