When I get the latest version of our automated test with some files checked out to me, I get an error saying that there are unresolved conflicts. In those files, I've deleted some steps. The files from the source control still have those steps an when I get the latest version because there new files added. How can we resolve this issue? With out reverting my current version. I've already have a new recording.
Thanks.
11 Answers, 1 is accepted
The error message is trying to tell you that someone else checked in changes to at least one of the files contained in your test project that you also changed (technically it is TFS reporting the error when we attempt to check-in the file and we're just displaying the error to you). Test Studio cannot merge your changes with the other persons changes. Actually you cannot merge changes of Test Studio tests.
You will need to use a full version control system, such as what comes with Visual Studio to overcome this problem. You will need to either discard the other persons changes or discard your changes and download his version.
Cody
the Telerik team
Rank 1
We have an TFS, how can we checkin the changes?
1. The Test Studio has a mapping on the project folder that we are working.
2. Should we export the Test Studio Project to VS?
Thanks.
It is not necessary to export the project to VS. You should be able to use the Source Control Explorer and/or the Pending Changes window in VS to resolve the conflict. See the attached screen shots for how to access these windows in VS.
Greetings,Cody
the Telerik team
Rank 1
I've used the workspace of the TestStudio and noticed that some of the files are not checked in or latest version. See attached screenshot.
Also, we can't revert the datasource alone. We can only revert it, if we revert the whole project.
Thanks.
Looking at your screen shot I see a couple of other strange things:
- There is no "Last Check-in" date for anything implying nothing has been checked in at all, ever.
- A couple of your folders are marked "Not downloaded"
Can you confirm you're using the right Workspace? You can select/change it via the "Workspace:" dropdown shown at the top of your screen shot.
Cody
the Telerik team
Rank 1
I'm using the correct workspace that is mapped to the project on the Test Studio. Currently I'm only using the Test Studio to Get Latest version and Check-in some files. I still haven't used the tfs to get the latest version and check in some files. Because I'm not sure if the our project might encounter some problems.
I'd like to look at this problem on your computer via GoToMeeting. Let me know what time zone you are in and your availability and I'll setup the meeting. I'm in Austin, TX which is Central Time (GMT -6).
Greetings,Cody
the Telerik team
Rank 1
We have been seeing this error all across our testing team and are unsure of the source. I found this support thread, but it must have been resolved via direct contact with the customer as it was not documented here.
I've gone into TFS and forced updates of all my files from the TFS source base, and when I then do a "Get Latest" from within Telerik, it still tosses "the some files were not updated because of unresolved conflicts" error dialog. I do not have any files checked out at all.
My Telerik version is 2011.*.1209.
I am sorry you are experiencing this error. Unfortunately it never got resolved for Mariko because he/she never responded to my meeting request. I'll be happy to do a GoToMeeting with you instead to study this problem on your computer. Just let me know what time works for you... keep in mind I'm located in central Texas which is CST.
Best wishes,Cody
the Telerik team
Rank 1
I wasn't able to arrange a meeting because of business travel arrangements. But we stopped seeing this error after we landed and started working on it again. We're not sure what was causing it. Our workaround (which may or may not have been an issue) was to update the working files from within Team Foundation Server before opening Telerik and connecting to the project.
In any event, we haven't seen it for a few days. Suspect it might be a user error on the part of someone who is incorrectly checking out files from TFS, but that's just a hypothesis based on a reported instance of someone incorrectly checking out files from TFS...
Best wishes, and hopefully it won't reappear.
-- JDP
Of course I am glad to hear the problems seems to have fixed itself. We'll standby if you need any further assistance.
Kind regards,Cody
the Telerik team