How to trigger a checkin & resolve conflict action when using vsdiffmerge as external compare tool?
I try to use Visual Studio Built-In Compare/Merge Tool (vsdiffmerge.exe) as external compare tool.
The comparing works fine but the merging does not really work the way I would like it to work.
When I click on the "Accept Merges" button in the "Merges" window in Visual Studio the file will be saved (so the manual merging is done) and vsdiffmerge.exe process exits (exit code: 0) but in eclipse I still see the conflict.
I would like to notify RTC so that the conflict can be "Resolved as Merged" as if I clicked on this button in eclipse.
I already used vsdiffmerge.exe for Git and there was a parameter named "trustexitcode" which was set to true and it worked like a charm.
Is there any way to achieve this way of working?
I mainly use eclipse for RTC but I also have the RTC Client for Visual Studio.
The comparing works fine but the merging does not really work the way I would like it to work.
When I click on the "Accept Merges" button in the "Merges" window in Visual Studio the file will be saved (so the manual merging is done) and vsdiffmerge.exe process exits (exit code: 0) but in eclipse I still see the conflict.
I would like to notify RTC so that the conflict can be "Resolved as Merged" as if I clicked on this button in eclipse.
I already used vsdiffmerge.exe for Git and there was a parameter named "trustexitcode" which was set to true and it worked like a charm.
Is there any way to achieve this way of working?
I mainly use eclipse for RTC but I also have the RTC Client for Visual Studio.
Accepted answer
This has been requested in work item: Automatic Resolution of the merge conflict flag with 3rd party merge tools (152439)
To indicate your support, you can add your vote, and any comment you would like.
To indicate your support, you can add your vote, and any comment you would like.
Comments
Surya Tripathi
Dec 18 '15, 12:28 p.m.Could you please share how have you configured vsdiffmerge arguments in Eclipse?
Gabor Csizmadia
Feb 03 '16, 5:22 p.m.It's a bit tricky as setting vsdiffmerge.exe directly does not work. I will create a page with the whole story and then I will provide a link here.