• Status: Solved
  • Priority: Medium
  • Security: Public
  • Views: 1101
  • Last Modified:

TFS Merge Tool

Experts,

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?
0
NigelRocks
Asked:
NigelRocks
  • 3
  • 2
1 Solution
 
magicdlfCommented:
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:
http://blogs.msdn.com/buckh/archive/2006/03/09/configure-diff-merge.aspx
For the merge tool, I recommend SourceGear DiffMerge:
http://www.sourcegear.com/diffmerge/
0
 
NigelRocksAuthor Commented:
So I'm not the only one that finds the TFS merge tool a little confusing?
0
 
magicdlfCommented:
Correct. I'd rather compare it myself after an auto merge.  You can replace it with any other diff/merge tool whenever you want.
0
 
NigelRocksAuthor Commented:
Is there anyway I can "disconnect" the three windows from each other so I can scroll in the lower window without moving the others?
0
 
NigelRocksAuthor Commented:
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?

image.bmp
0

Featured Post

Hire Technology Freelancers with Gigs

Work with freelancers specializing in everything from database administration to programming, who have proven themselves as experts in their field. Hire the best, collaborate easily, pay securely, and get projects done right.

  • 3
  • 2
Tackle projects and never again get stuck behind a technical roadblock.
Join Now