Using MS Team Foundation Server with Labview

[Daklu]

We are using MS Team Foundation Server (Visual Studio 2008) as our repository for our Labview (8.6.1) code.  I've been having some trouble figuring out how to create an effective workflow using the tools available.  We follow a Trunk, Tag, & Branch coding model.  Each developer branches the project trunk when they start work on a new feature.  Once that feature is complete and debugged on their branch they merge it back into the trunk and delete the branch.

Questions:

1. I don't see how to use LV's Merge VI utility with this model.  Merge VI requires a base vi, their vi, and your vi.  Suppose I branch OurProject and make some changes to Main.vi.  Before I get a chance to merge my branch back into the trunk another developer, Mike, checks in his changes to Main.vi, overwriting the base vi.  The base version of Main.vi isn't stored on a file system somewhere so selecting with the Merge VI utility's browse dialog boxes doesn't work.  What's the best way of working around this?
2. I'm a little confused on setting up TFS to use the Merge VI utility.  I found this document that describes how to set up Perforce.  The document describes a Base vi (the version I checked out), Their vi (the version Mike checked in), Your vi (my current version), and Merged vi (the vi resulting from the merge.)  In TFS I found User Tools in Tools -> Options -> Source Control -> Visual Studio Team Foundation Server -> Configure User Tools.  The command line argument options are Original file, Modified file, Base file, and Merged file.  How does the "Original file" and "Modified file" map to "Their vi" and "Your vi?"  I'm guessing Original would be the one Mike checked in and Modified would be mine, but I couldn't find anything in TFS help that explains it.

Thanks,

Dave

[Daklu]

I went ahead and set up LV's Merge VI utility by mapping "Original file" to "Their VI" and "Modified file" to "Your VI."  However, when I attempt to resolve the conflicts that arise from the branch merge operation, the option "Merge changes in merge tool" is disabled.

Still searching for a solution....