From the SVN world, it was easy: 1) merge and get a conflict. SVN provides conflicting files in a working copy. 2) allow them in any way that you need (using any external tool, if required). 3) "svn resolved" to mark the conflict as resolved. 4) check (or continue work, etc.).
Now with TFS and Visual Studio (2010), the only parameters we have are: - -> Combine the TFS merge tool (text files only). -> For non-text files, take the source branch file (overwrite the target branch file) or save the target branch file (ignore the source branch file).
I need to resolve conflicts for some of my file types using external tools (like Erwin), and then mark the conflict as resolved.
I tried to resolve the conflict by placing a new file in the workspace of the target file system (ie a working copy) and using "tf resolve / auto: DeleteConflict". It did not help. The local allowed / consolidated file was completely ignored when I finally checked the merge.
Of course, TFS / VS can do it!
Any help would be really appreciated!
Thank.
source
share