Hello, I am having an issue where the merge tool does not return any code, it is blank. Not sure if it is my configuration or an issue.
Repro:
App set up connected to TFS for repository and source control
1. User One checks out a test
2. User Two opens same test, makes a change and checks back in
3. User One checks in (Recieves message that file has been updated)
4. User One get latest (Merge tool opens)
** Merge tool opens, shows line numbers, but lines are blank (See attached pic)
Thank you for your assistance.
Repro:
App set up connected to TFS for repository and source control
1. User One checks out a test
2. User Two opens same test, makes a change and checks back in
3. User One checks in (Recieves message that file has been updated)
4. User One get latest (Merge tool opens)
** Merge tool opens, shows line numbers, but lines are blank (See attached pic)
Thank you for your assistance.
1 Answer, 1 is accepted
0
Hello Rob,
It is not possible to merge changes to Test Studio tests made by two people. They are stored in a proprietary JSON format (which appear as one single very long string to any text editor, including the merge tool). We consider your repro steps that you have described as an illegal operation to Test Studio tests. Our official recommendation is to always use Exclusive Lock when checking tests out from TFS. Your TFS administrator can set this as the default checkout option also.
I have converted your support ticket into a public forum post for the benefit of our other customers.
Regards,
Cody
Telerik
It is not possible to merge changes to Test Studio tests made by two people. They are stored in a proprietary JSON format (which appear as one single very long string to any text editor, including the merge tool). We consider your repro steps that you have described as an illegal operation to Test Studio tests. Our official recommendation is to always use Exclusive Lock when checking tests out from TFS. Your TFS administrator can set this as the default checkout option also.
I have converted your support ticket into a public forum post for the benefit of our other customers.
Regards,
Cody
Telerik