TFS "Conflicts Detected" prevents check in

[Richard Beverly]

Hi,

Using Test Studio version 2023.1.329.1

I have TFS service connected, and I AM able to check in other files successfully, but when trying to check in 2 of the files, I get the error:

Conflicts detected with source repository version. Resolve conflicts?

When I select "OK", the modal alert box goes away, but the conflict isn't resolved, and this error is displayed each time I try to check in either of these 2 files. In VS, I'd expect a merge window, with 2 panes and diff code highlighted, but nothing like that shows up.

I need to check this code in. I see no "take local version" option.

Please advise.

[Elena]

Hello Richard,

Test Studio doesn't provide the option for resolving merge conflicts. These need to be handled outside of Test Studio and then the changes to be pushed. 

This dialog probably shows because you work with TFS in Visual Studio. I will pass the information to the engineering team so that we can find the best way to handle this and avoid any wrong expectations.

Please, take the time to resolve the conflicts in the two files outside of Test Studio and let me know if you continue experience any troubles. Thank you for your cooperation in advance.

Regards,
Elena
Progress Telerik