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.