I am calling ResolveConflict method on my TFS WorkSpace:
this.workspace.ResolveConflict(conflict, out resolvedConflicts)
In TFS 2010, it will show the merge tool diffmerge.exe.But it doesn't show any merge tool in TFS 2012. According to this article http://blogs.msdn.com/b/bharry/archive/2011/08/31/merge-enhancements-in-tfs-11.aspx, I know the diffmerge.exe has been removed in VS 2012, The new tool is vsDiffmerge.exe. I can find the tool in my VS 2012 installation directory. But it doesn't show the tool when call the ResolveConflict method. Does anyone have any idea how I can resolve it?
The merge tool is not showing when call Workspace.ResolveConflict method in TFS 2012
263 Views Asked by Gary Zhu At
0
There are 0 best solutions below
Related Questions in C#
- Passing arguments to main in C using Eclipse
- kernel module does not print packet info
- error C2016 (C requires that a struct or union has at least one member) and structs typedefs
- Drawing with ncurses, sockets and fork
- How to catch delay-import dll errors (missing dll or symbol) in MinGW(-w64)?
- Configured TTL for A record(s) backing CNAME records
- Allocating memory for pointers inside structures in functions
- Finding articulation point of undirected graph by DFS
- C first fgets() is being skipped while the second runs
- C std library don't appear to be linked in object file
- gcc static library compilation
- How to do a case-insensitive string comparison?
- C programming: Create and write 2D array of files as function
- How to read a file then store to array and then print?
- Function timeouts in C and thread
Related Questions in VISUAL-STUDIO-2012
- Pass multiple account variables to single parameter
- Cannot find InvalidCastException in C# Application
- Upgrading separate Project Collection Database to new TFS Version
- How to add asp.net mvc5 to visual studio express 2012 edition?
- How to deploy Windows app with SQL Server database?
- The merge tool is not showing when call Workspace.ResolveConflict method in TFS 2012
- Toggle groups based on a parameter
- SQL server 2008 with 2012 Data tools
- Accessing parent parameters from child package SSIS 2012
- How to add parameters in the comments of a method in Visual Studio after it has been generated?
- No warning on deleting a forward declared pointer (Visual Studio)
- EWS Service.FindItems() throws an exception when using SearchFilter.IsEqualTo
- Label change when button click
- SharePoint 365 Development - Visual Studio 2012 - Actions4 file
- Team Foundation 2012 not recognising changes in vb6 app
Related Questions in TFS
- Missing Header (Feature Title and Toolbar) on some Feature Work Items in TFS Web Access
- Upgrading separate Project Collection Database to new TFS Version
- OpsHub Visual Studio Online Migration Utility Hangs on Creating Configuration
- The merge tool is not showing when call Workspace.ResolveConflict method in TFS 2012
- HowTo: change a project's status from `Invalid` to `Valid`?
- TFS 2013 Object reference not set to an instance of an object in Team Explorer
- Release Management for Visual Studio 2013 - Release Exception
- Visual studio 2013 team project has been deleted
- TFS version control does not show conflicts
- include typescript file in output result build with TFS
- Team Foundation 2012 not recognising changes in vb6 app
- WebDeploy from TFS using Build Definitions to IIS site containing files changed by users
- Team Foundation plugin for Android Studio
- TFS 2013 with Octopus Deploy, Email Template - Resolved Bugs/User Stories
- What is the best branching strategy in TFS to share code between multiple team projects?
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?