CODEWITHSUNDEEP
visual-studio-2010version-controltfstortoisesvn
dev.e.loper
dev.e.loper

Reputation: 36044

Using TortoiseMerge with Visual Studio and TFS - Merge Target (not found)

I want to set up TortoiseMerge as a merge tool in Visual Studio 2010. I'm using TFS for source control. In Visual Studio I configured TortoiseMerge to be a merge tool and gave it parameters specified here /base:%3 /mine:%2 /theirs:%1 /basename:%8 /minename:%7 /theirsname:%6 /merged:%4 /mergedname:%9

enter image description here

When I try to merge, the Merge Target says that it is not found. What am I missing?

enter image description here

Upvotes: 7

Views: 2636

Answers (1)

Jonno
Jonno

Reputation: 1976

I have been using TortoiseMerge for years and that message always appears during merge. Not sure why, but merging works, saving the file works (it's considered you've done the merge) and most importantly VS (or TF.EXE) picks up the merged file and asks you for confirmation when you're done.

Enjoy it :-)

Upvotes: 5

Related Questions