I’m in a situation where I need to merge multiple branches of a codebase, one from TFS and one in held by git, into git. But it seems that two instances of VS share a single setting for source code provider so, for example if I want to check the history of a file in TFS prior to merging I have to manually switch providers under Tools -> Options, do my checking and switch it back.
Having to have two instances of VS running concurrently, is hard enough in terms of remembering what is what, having multiple branches is worse and having multiple source control bindings is the pits.
Is there a work-around?
You could use
git-tfto create a temporary GIT working copy of your TFS data, do the merge all in GIT. And then commit the changes back to TFS using git-tf if you need to update TFS as well.