TFS Merge Tool

Posted on 2010-01-05
Last Modified: 2013-11-26

Where can I find some good tips on using the TFS merge tool?  It seems like as I scroll through discrepancies between files, the merged file in the lower center loses its place.  I can't seem to search for the line of code I'm looking for either, so see how the merged file handled the discrepancy.

What am I missing?
Question by:NigelRocks
    LVL 9

    Accepted Solution

    Usually I perform an auto merge and then compare the files myself (I have a powerful compare tool and usually the auto merge looks good). If you have special requirements, you can change the merge tool by following the instructions of this links:
    For the merge tool, I recommend SourceGear DiffMerge:
    LVL 1

    Author Comment

    So I'm not the only one that finds the TFS merge tool a little confusing?
    LVL 9

    Expert Comment

    Correct. I'd rather compare it myself after an auto merge.  You can replace it with any other diff/merge tool whenever you want.
    LVL 1

    Author Comment

    Is there anyway I can "disconnect" the three windows from each other so I can scroll in the lower window without moving the others?
    LVL 1

    Author Comment

    Attached is a screen-shot of what I'm trying to work with.
    On the left is the blue text that shows code that has been changed.  If it has been changed, why isn't the code that has been changed not automatically showing up in the right panel?


    Featured Post

    Enabling OSINT in Activity Based Intelligence

    Activity based intelligence (ABI) requires access to all available sources of data. Recorded Future allows analysts to observe structured data on the open, deep, and dark web.

    Join & Write a Comment

    Suggested Solutions

    Title # Comments Views Activity
    ASP.NET MVC Edit ViewModel Data 6 24
    DataGridView 2 14
    Linux operating system 12 29
    The Using statement in C# 5 12
    Normally the drop down box control found in the .Net framework tools is able to select just one data and value at a time, which is displayed on the text area.   But what if you want to have multiple values to be selected in the drop down box? As …
    In my previous two articles we discussed Binary Serialization ( and XML Serialization ( In this article we will try to know more about SOAP (Simple Object Acces…
    Migrating to Microsoft Office 365 is becoming increasingly popular for organizations both large and small. If you have made the leap to Microsoft’s cloud platform, you know that you will need to create a corporate email signature for your Office 365…
    This video discusses moving either the default database or any database to a new volume.

    733 members asked questions and received personalized solutions in the past 7 days.

    Join the community of 500,000 technology professionals and ask your questions.

    Join & Ask a Question

    Need Help in Real-Time?

    Connect with top rated Experts

    17 Experts available now in Live!

    Get 1:1 Help Now