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
270 views Asked by Gary Zhu At
0
There are 0 answers
Related Questions in C#
- How to call a C language function from x86 assembly code?
- What does: "char *argv[]" mean?
- User input sanitization program, which takes a specific amount of arguments and passes the execution to a bash script
- How to crop a BMP image in half using C
- How can I get the difference in minutes between two dates and hours?
- Why will this code compile although it defines two variables with the same name?
- Compiling eBPF program in Docker fails due to missing '__u64' type
- Why can't I use the file pointer after the first read attempt fails?
- #include Header files in C with definition too
- OpenCV2 on CLion
- What is causing the store latency in this program?
- How to refer to the filepath of test data in test sourcecode?
- 9 Digit Addresses in Hexadecimal System in MacOS
- My server TCP doesn't receive messages from the client in C
- Printing the characters obtained from the array s using printf?
Related Questions in VISUAL-STUDIO-2012
- An error occurred while trying to restore packages: 'Dapper' already has a dependency defined for 'System.Data.SqlClient'
- Getting Error 0x80131509 whenever I try to create a new empty project (using vs2012 as it's what my uni prefers)
- Visual Basic Supports
- Open Visual Studio 2012 solution in Visual Studio 2013
- Gif is Slow in Visual Studio C# Winform Application?
- The type initializer for 'Sybase.Data.AseClient1.AseConnection' threw an exception. SSIS - Sybase
- Is there a way to fix broken syntax highlighting in Visual Studio 2012?
- Visual Studio Ultimate
- Can __uuidof be used as a C-string const?
- How to connect MS Access database to Visual Basic
- Cannot drag and drop items from toolbox in Visual studio
- Invalid operation. Could not find default endpoint element
- I keep on receiving a "bash permission denied" notification every time I try to execute a program on VS Code
- Wix Toolset v4 Shortcut & installation directory per login user
- Migrating from VS2012: Opening in VS2022 does not prompt for upgrade
Related Questions in TFS
- Azure DevOps Server witadmin error 500 when downloading/uploading workitem XML
- How to fix a CS0281 error on build server
- Integrate Deployment status to Work Items in TFS
- How to customize data sources in the dropdown box of TFS work item templates
- How to add nuget package for offline tfs build task
- Using Azure DevOps Server 2022 (On-Premise) with Visual Studio Code for Java Project
- Ticketstatus on DynamicsCRM updates on TFS Ticketstatus change
- Limiting access to files in Github while being edited by other collaborator
- Trying to read commits from azure devops rest api results in redirects
- ADOS .NET: Exchange SOAP Methode to REST equivalent
- DevOps 2022 Server not connecting on VS 2012 and VS 2010
- TFS integration with Jenkins
- Preventing Merge and Branch your own code on TFS
- Get all users of an Ado or TFS project
- Reduce AzureDevOps aka. TFS Database size
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?
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)