0

On my first company PC we first installed VS2015, and then later installed VS2019, and eventually VS2022

On that PC we could always merge a shelveset into a new branch successfully, sometimes you end up having to click "Resolve...\Keep my local changes, and merge the local and shelved contents."

This would launch whatever tool had been configured with the TFS Source Control Plugin, previously I had configured it to launch my own .cmd file which I used so that I could easily swap between merge tools without going into the plugin configuration.

We were then given a laptop, and by this time we no longer needed VS2015.

Initially to get TFPT to recognise the workspace configured in TFS we had to run TF.EXE workspaces /s:TFSURL, and from that point TFPT was able to discover the workspace settings.

Now when I try and launch the third-party merge tool it doesn't even attempt to launch it as far as i can see. I put some logging in the .cmd file and it doesn't get output so I am doubtful it has attempted to launch it.

The command I'm running is tfpt unshelve /migrate /source:"$/v22.4" /target:"$/v23.1" "WIP"

From time to time, I have seen it launch the third party tool, but I didn't change anything between the times it wasn't working, and when it wasn't.

Does anyone know any troubleshooting steps I can follow to make the third party tool launch. Removing the customisation hasn't resulted in the merge tool inside Visual Studio

Peter Nimmo
  • 1,045
  • 2
  • 12
  • 25
  • Tried configuring the plugin selection with the one for Visual Studio - vsDiffMerge.exe with ` %1 %2 %3 %4 /t /m` Visual Studio didn't launch and again the same failure message appeared – Peter Nimmo Oct 12 '22 at 16:26

0 Answers0